Commit 956cec6f authored by Jürgen Matzka's avatar Jürgen Matzka
Browse files

Merge branch 'master' into Functions

parents 37481044 d32e44f6
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -21,8 +21,8 @@
% attachment: same file
clear all
startdate = jd2000(2018, 04, 26); % HERE START DATE FOR non-online
enddate = jd2000(2018, 04, 26); % HERE END DATE FOR non-online
startdate = jd2000(2018, 05, 04); % HERE START DATE FOR non-online
enddate = jd2000(2018, 05, 06); % HERE END DATE FOR non-online
station = 'VNA1';
%station = 'WNG1';
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -601,7 +601,11 @@ if exist(DI_file, 'file') == 2;
&& timeDI(1) < jd2000(2017, 5, 12)
ppmsource = 's'; % 's' for spreadsheet, 'c' for cdf
end
if strcmp(station(1:3), 'SMA')...
&& timeDI(1) > jd2000(2018, 4, 18)
ppmsource = 's'; % 's' for spreadsheet, 'c' for cdf
end
%
......@@ -704,9 +708,11 @@ if exist(DI_file, 'file') == 2;
if strcmp(station(1:3), 'SMA')
mire_nr = raw1{8,6};
pillar_nr = 1;
deltappm =0
deltaI = 0.0000 + 0.0000;
deltaD = 0.0000 + 0.0000;
if timeDI(1) >= jd2000(2017, 05, 01)
if timeDI(1) >= jd2000(2017, 05, 01)...
&& timeDI(1) < jd2000(2018, 04, 18)
deltappm =11;% Sockeldiff. Apr. 2018
end
......@@ -1644,6 +1650,10 @@ if exist(DI_file, 'file') == 2;
code(1:2) = '42'
elseif strcmp(upper(operator), 'VCA')%Victor Arbs.VSS
code(1:2) = '43'
elseif strcmp(upper(operator), 'JC')%Jorge Cruz 2018 SMA
code(1:2) = '44'
elseif strcmp(upper(operator), 'AND')%Horcio Andr 2018 SMA
code(1:2) = '45'
end
%Danieal Armbruster vna 2014
%Johannes Lohse vna 2014
......@@ -1753,6 +1763,10 @@ if exist(DI_file, 'file') == 2;
H10 = 18868.09;
Z10 = 45418.48;
end
if strcmp(station(1:4), 'WNG5') % passt gut
H10 = 18868.09;
Z10 = 45418.48;
end
if strcmp(station(1:4), 'NGK3') % passt gut
H10 = 18879.14;
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment