Add PWV output to tropo.txt file

fixing minor alignment in output files
goGPS-Project · Mar 5, 2017 · 5e4a73a · 5e4a73a
1 parent 76df6b8
commit 5e4a73a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 24 deletions.
diff --git a/data/project/default_DD/config/settings.ini b/data/project/default_DD/config/settings.ini
@@ -58,8 +58,7 @@ img_logo64 = "../data/img/goGPS_logo_64.png"
 # Output style
 out_style = 0
 #  0: old goGPS naming - each file saved with run number in out_dir
-#  1: run naming - each file saved in a folder containing the run number in out_dir
-#  2... other values for future implementation, e.g. each output in a folder with a certain format (doy_hh-hh)
+#  1... other values for future implementation, e.g. each output in a folder with a certain format (doy_hh-hh)
 
 # out_style = 0 -> Directory containing the basic output folder of the project - path relative to goGPS folder
 # out_style = 1 -> Directory containing the basic output folder of the project - path relative to home folder
@@ -68,7 +67,7 @@ out_dir = "../data/project/default_DD/out"
 # out_style = 1 -> Every time a solution is computed a folder with prefix followed by the run number is created and the outputs are stored into it
 out_prefix = "yamatogawa"
 # Current run number
-run_counter = 0
+run_counter = 4
 
 #--------------------------------------------------------------------------------
 [EXTERNAL FILE INPUT INI]
@@ -88,18 +87,21 @@ master_target_file = "yamatogawa_master.obs"
 receiver_source_number = 1
 receiver_source_path = "../data/project/default_DD/RINEX/"
 receiver_source_file = "yamatogawa_rover.obs"
+# Binary files
+bin_path = 
+bin_file = 
 # Stations coordinates file
-crd_path = "/"
+crd_path = ""
 # PCO - PCV files
 atx_path = "../data/antenna/ATX/I08.ATX"
 # Ocean loading file
-ocean_path = "/"
+ocean_path = ""
 # Meteorological file
-met_path = "/"
+met_path = ""
 # Reference path path
-ref_path =
+ref_path = 
 # Reference DTM path
-dtm_path =
+dtm_path = 
 
 #--------------------------------------------------------------------------------
 [RECEIVERS]
@@ -381,3 +383,4 @@ password = ""
 ntrip_lat = 0
 ntrip_lon = 0
 ntrip_h = 0
+
diff --git a/data/project/default_PPP/config/settings.ini b/data/project/default_PPP/config/settings.ini
@@ -58,8 +58,7 @@ img_logo64 = "../data/img/goGPS_logo_64.png"
 # Output style
 out_style = 0
 #  0: old goGPS naming - each file saved with run number in out_dir
-#  1: run naming - each file saved in a folder containing the run number in out_dir
-#  2... other values for future implementation, e.g. each output in a folder with a certain format (doy_hh-hh)
+#  1... other values for future implementation, e.g. each output in a folder with a certain format (doy_hh-hh)
 
 # out_style = 0 -> Directory containing the basic output folder of the project - path relative to goGPS folder
 # out_style = 1 -> Directory containing the basic output folder of the project - path relative to home folder
@@ -68,7 +67,7 @@ out_dir = "../data/project/default_PPP/out"
 # out_style = 1 -> Every time a solution is computed a folder with prefix followed by the run number is created and the outputs are stored into it
 out_prefix = "zimm_PPP"
 # Current run number
-run_counter = 0
+run_counter = 13
 
 #--------------------------------------------------------------------------------
 [EXTERNAL FILE INPUT INI]
@@ -77,17 +76,20 @@ run_counter = 0
 # All the parameters here listed cannot be modified for import
 
 # Variometric approach parameter
-variometric_time_step =
+variometric_time_step = 
 # Navigational files
 nav_path = "../data/satellite/EPH/"
 nav_file = "igs18590.sp3"
 # Master/Target(if SEID) file
-master_target_path =
-master_target_file =
+master_target_path = 
+master_target_file = 
 # Receivers/Source(if SEID) files
 receiver_source_number = 1
 receiver_source_path = "../data/project/default_PPP/RINEX/"
 receiver_source_file = "ZIMM2350.15O"
+# Binary files
+bin_path = 
+bin_file = 
 # Stations coordinates file
 crd_path = "../data/project/default_PPP/station/CRD/stations.crd"
 # PCO - PCV files
@@ -97,9 +99,9 @@ ocean_path = "../data/project/default_PPP/station/ocean/ocean_loading.blq"
 # Meteorological file
 met_path = "../data/project/default_PPP/station/MET/zimm2350.15m"
 # Reference path path
-ref_path =
+ref_path = 
 # Reference DTM path
-dtm_path =
+dtm_path = 
 
 #--------------------------------------------------------------------------------
 [RECEIVERS]
@@ -238,7 +240,7 @@ w_mode = 1
 # Weight function parameters (when based on SNR): a / 0 / 1 / A
 w_snr = [30 10 10 30]
 # Cycle slip threshold (processing) [cycles]
-cs_thr = 1e30
+cs_thr = 1e+30
 # Enable usage of iono-free combination in PPP (0/1)
 flag_ionofree = 1
 # Constrain the solution using a reference path
@@ -381,3 +383,4 @@ password = ""
 ntrip_lat = 0
 ntrip_lon = 0
 ntrip_h = 0
+
diff --git a/goGPS/goGPS.m b/goGPS/goGPS.m
@@ -3043,7 +3043,7 @@
 
     %file saving
     if (strcmp(fsep_char,'default'))
-        head_str = '    Date        GPS time         GPS week          GPS tow         Latitude        Longitude      h (ellips.)           ECEF X           ECEF Y           ECEF Z        UTM North         UTM East      h (orthom.)         UTM zone        Num. Sat.             HDOP            KHDOP      Local North       Local East          Local H    Ambiguity fix     Success rate              ZTD              ZWD              PWV\n';
+        head_str = '    Date        GPS time           GPS week          GPS tow         Latitude        Longitude      h (ellips.)           ECEF X           ECEF Y           ECEF Z        UTM North         UTM East      h (orthom.)         UTM zone        Num. Sat.             HDOP            KHDOP      Local North       Local East          Local H    Ambiguity fix     Success rate              ZTD              ZWD              PWV\n';
         row_str = '%02d/%02d/%02d    %02d:%02d:%06.3f %16d %16.3f %16.8f %16.8f %16.4f %16.4f %16.4f %16.4f %16.4f %16.4f %16.4f %16s %16d %16.3f %16.3f %16.4f %16.4f %16.4f %16d %16.4f %16.3f %16.3f %16.3f\n';
     else
         head_str = strcat('Date',fsep_char,'GPS time',fsep_char,'GPS week',fsep_char,'GPS tow',fsep_char,'Latitude',fsep_char,'Longitude',fsep_char,'h (ellips.)',fsep_char,'ECEF X',fsep_char,'ECEF Y',fsep_char,'ECEF Z',fsep_char,'UTM North',fsep_char,'UTM East',fsep_char,'h (orthom.)',fsep_char,'UTM zone',fsep_char,'Num. Sat.',fsep_char,'HDOP',fsep_char,'KHDOP',fsep_char,'Local North',fsep_char,'Local East',fsep_char,'Local H',fsep_char,'Ambiguity fix',fsep_char,'Success rate',fsep_char,'ZTD',fsep_char,'ZWD',fsep_char,'PWV\n');
@@ -3103,7 +3103,7 @@
     if (~exist('is_batch','var'))
         % Save in matlab format all the outputs
         if flag_tropo
-            save([filerootOUT '_position.mat'], 'date_R', 'week_R', 'tow', 'phi_KAL', 'lam_KAL', 'h_KAL', 'X_KAL', 'Y_KAL', 'Z_KAL', 'NORTH_UTM', 'EAST_UTM', 'utm_zone', 'nsat', 'HDOP', 'KHDOP', 'NORTH_KAL', 'EAST_KAL', 'UP_KAL', 'fixed_amb', 'succ_rate', 'estim_tropo');
+            save([filerootOUT '_position.mat'], 'date_R', 'week_R', 'tow', 'phi_KAL', 'lam_KAL', 'h_KAL', 'X_KAL', 'Y_KAL', 'Z_KAL', 'NORTH_UTM', 'EAST_UTM', 'utm_zone', 'nsat', 'HDOP', 'KHDOP', 'NORTH_KAL', 'EAST_KAL', 'UP_KAL', 'fixed_amb', 'succ_rate', 'estim_tropo', 'ZWD', 'PWV');
         else
             save([filerootOUT '_position.mat'], 'date_R', 'week_R', 'tow', 'phi_KAL', 'lam_KAL', 'h_KAL', 'X_KAL', 'Y_KAL', 'Z_KAL', 'NORTH_UTM', 'EAST_UTM', 'utm_zone', 'nsat', 'HDOP', 'KHDOP', 'NORTH_KAL', 'EAST_KAL', 'UP_KAL', 'fixed_amb', 'succ_rate');
         end
@@ -3422,17 +3422,17 @@
     fprintf('Writing troposphere file...\n');
     %file saving
     if (strcmp(fsep_char,'default'))
-        head_str = '    Date        GPS time         GPS week          GPS tow              ZHD              ZTD';
-        row_str = '%02d/%02d/%02d    %02d:%02d:%06.3f %16d %16.3f %16.3f %16.3f';
+        head_str = '    Date          GPS time         GPS week          GPS tow              ZHD              ZTD              ZWD              PWV';
+        row_str = '%02d/%02d/%02d    %02d:%02d:%06.3f %16d %16.3f %16.3f %16.3f %16.3f %16.3f';
         for s = 1 : nSatTot
             head_str = [head_str '         STD ' constellations.systems(s) num2str(constellations.PRN(s),'%02d')]; %#ok<AGROW>
             row_str  = [row_str  '%16.3f']; %#ok<AGROW>
         end
         head_str = [head_str '\n'];
         row_str  = [row_str  '\n'];
     else
-        head_str = strcat('Date',fsep_char,'GPS time',fsep_char,'GPS week',fsep_char,'GPS tow',fsep_char,'ZHD',fsep_char,'ZTD');
-        row_str = strcat('%02d/%02d/%02d',fsep_char,'%02d:%02d:%f',fsep_char,'%d',fsep_char,'%f',fsep_char,'%f',fsep_char,'%f');
+        head_str = strcat('Date',fsep_char,'GPS time',fsep_char,'GPS week',fsep_char,'GPS tow',fsep_char,'ZHD',fsep_char,'ZTD',fsep_char,'ZWD',fsep_char,'PWV');
+        row_str = strcat('%02d/%02d/%02d',fsep_char,'%02d:%02d:%f',fsep_char,'%d',fsep_char,'%f',fsep_char,'%f',fsep_char,'%f',fsep_char,'%f',fsep_char,'%f');
         for s = 1 : nSatTot
             head_str = [head_str,fsep_char,constellations.systems(s),num2str(constellations.PRN(s),'%02d')]; %#ok<AGROW>
             row_str  = [row_str, fsep_char,'%16.3f']; %#ok<AGROW>
@@ -3444,7 +3444,7 @@
     fprintf(fid_tropo, head_str);
     for i = 1 : nObs
         %file writing
-        fprintf(fid_tropo, row_str, date_R(i,1), date_R(i,2), date_R(i,3), date_R(i,4), date_R(i,5), date_R(i,6), week_R(i), tow(i), ZHD(i), estim_tropo(i), STDs(:,i)');
+        fprintf(fid_tropo, row_str, date_R(i,1), date_R(i,2), date_R(i,3), date_R(i,4), date_R(i,5), date_R(i,6), week_R(i), tow(i), ZHD(i), estim_tropo(i), ZWD(i), PWV(i), STDs(:,i)');
     end
 
     %file closing

diff --git a/goGPS/obj/Meteo_Data.m → goGPS/obj/files/Meteo_Data.m b/goGPS/obj/Meteo_Data.m → goGPS/obj/files/Meteo_Data.m