decArgo_20220217_047a commit

euroargodev · Nov 24, 2022 · a7d80ac · a7d80ac
1 parent 323dd2f
commit a7d80ac
Show file tree

Hide file tree

Showing 128 changed files with 8,636 additions and 5,521 deletions.
diff --git a/DB_export_CRUISE_NAME.csv b/DB_export_CRUISE_NAME.csv
diff --git a/DB_export_CRUISE_NAME.xlsx b/DB_export_CRUISE_NAME.xlsx
diff --git a/DB_export_SPECIAL_FEATURES.csv b/DB_export_SPECIAL_FEATURES.csv
diff --git a/DB_export_SPECIAL_FEATURES.xlsx b/DB_export_SPECIAL_FEATURES.xlsx
diff --git a/decArgo_doc/DOXY_ADJUSTED_ERROR_specification/DOXY_RT_adjustment_1.1_20210419_FINAL.docx b/decArgo_doc/DOXY_ADJUSTED_ERROR_specification/DOXY_RT_adjustment_1.1_20210419_FINAL.docx
diff --git a/decArgo_doc/DOXY_ADJUSTED_ERROR_specification/DOXY_RT_adjustment_2.0.docx b/decArgo_doc/DOXY_ADJUSTED_ERROR_specification/DOXY_RT_adjustment_2.0.docx
diff --git a/decArgo_doc/decoder_versions/_argo_decoder_versions.xlsx b/decArgo_doc/decoder_versions/_argo_decoder_versions.xlsx
diff --git a/decArgo_soft/config/_techParamNames/_tech_param_name_126.csv b/decArgo_soft/config/_techParamNames/_tech_param_name_126.csv
@@ -139,3 +139,6 @@ TECH_PARAM_DEC_ID;TECH_PARAM_MSG_ID;TECH_PARAM_MSG_LABEL;TECH_PARAM_NAME;TECH_PA
 181;TECH_AUX;Date de detection de glace;TECH_AUX_CLOCK_IceDetection_YYYYMMDDHHMMSS;Time of ice detection.
 182;TECH_AUX;Immersion de detection de glace;TECH_AUX_PRES_IceDetection_dbar;Pressure of ice detection.
 183;TECH_AUX;End of life;TECH_AUX_CLOCK_EndOfLifeAlarm_YYYYMMDDHHMMSS;Alarm raised when the float switches to the End Of Life mode. When reported as a NUMBER, it provides the reason of the End Of Life (see float manual for details).
+250;TECH_AUX;GPS time offset for BGC times;TECH_AUX_TIME_GpsTimeOffsetForBgcTimeAdj_seconds;GPS time offset used to adjust all BGC times of the cycle (it is the GPS time offset set before transmission of the previous cycle).
+251;TECH_AUX;Time offset for descending profile BGC times;TECH_AUX_TIME_DescProfTimeOffsetForBgcTimeAdj_seconds;Estimated time offset used to adjust descending profile BGC times.
+252;TECH_AUX;Time offset for ascending profile BGC times;TECH_AUX_TIME_AscProfTimeOffsetForBgcTimeAdj_seconds;Estimated time offset used to adjust ascending profile BGC times.
diff --git a/decArgo_soft/config/_techParamNames/_tech_param_name_126.json b/decArgo_soft/config/_techParamNames/_tech_param_name_126.json
@@ -1118,5 +1118,29 @@
       "TECH_PARAM_MSG_LABEL" : "End of life",
       "TECH_PARAM_NAME" : "TECH_AUX_CLOCK_EndOfLifeAlarm_YYYYMMDDHHMMSS",
       "TECH_PARAM_DESCRIPTION" : "Alarm raised when the float switches to the End Of Life mode. When reported as a NUMBER, it provides the reason of the End Of Life (see float manual for details)."
+   },
+   "TECH_PARAM_141" :
+   {
+      "TECH_PARAM_DEC_ID" : "250",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "GPS time offset for BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_GpsTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "GPS time offset used to adjust all BGC times of the cycle (it is the GPS time offset set before transmission of the previous cycle)."
+   },
+   "TECH_PARAM_142" :
+   {
+      "TECH_PARAM_DEC_ID" : "251",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "Time offset for descending profile BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_DescProfTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "Estimated time offset used to adjust descending profile BGC times."
+   },
+   "TECH_PARAM_143" :
+   {
+      "TECH_PARAM_DEC_ID" : "252",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "Time offset for ascending profile BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_AscProfTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "Estimated time offset used to adjust ascending profile BGC times."
    }
 }
diff --git a/decArgo_soft/config/_techParamNames/_tech_param_name_127.csv b/decArgo_soft/config/_techParamNames/_tech_param_name_127.csv
@@ -150,3 +150,6 @@ TECH_PARAM_DEC_ID;TECH_PARAM_MSG_ID;TECH_PARAM_MSG_LABEL;TECH_PARAM_NAME;TECH_PA
 181;TECH_AUX;Date de detection de glace;TECH_AUX_CLOCK_IceDetection_YYYYMMDDHHMMSS;Time of ice detection.
 182;TECH_AUX;Immersion de detection de glace;TECH_AUX_PRES_IceDetection_dbar;Pressure of ice detection.
 183;TECH_AUX;End of life;TECH_AUX_CLOCK_EndOfLifeAlarm_YYYYMMDDHHMMSS;Alarm raised when the float switches to the End Of Life mode. When reported as a NUMBER, it provides the reason of the End Of Life (see float manual for details).
+250;TECH_AUX;GPS time offset for BGC times;TECH_AUX_TIME_GpsTimeOffsetForBgcTimeAdj_seconds;GPS time offset used to adjust all BGC times of the cycle (it is the GPS time offset set before transmission of the previous cycle).
+251;TECH_AUX;Time offset for descending profile BGC times;TECH_AUX_TIME_DescProfTimeOffsetForBgcTimeAdj_seconds;Estimated time offset used to adjust descending profile BGC times.
+252;TECH_AUX;Time offset for ascending profile BGC times;TECH_AUX_TIME_AscProfTimeOffsetForBgcTimeAdj_seconds;Estimated time offset used to adjust ascending profile BGC times.
diff --git a/decArgo_soft/config/_techParamNames/_tech_param_name_127.json b/decArgo_soft/config/_techParamNames/_tech_param_name_127.json
@@ -1206,5 +1206,29 @@
       "TECH_PARAM_MSG_LABEL" : "End of life",
       "TECH_PARAM_NAME" : "TECH_AUX_CLOCK_EndOfLifeAlarm_YYYYMMDDHHMMSS",
       "TECH_PARAM_DESCRIPTION" : "Alarm raised when the float switches to the End Of Life mode. When reported as a NUMBER, it provides the reason of the End Of Life (see float manual for details)."
+   },
+   "TECH_PARAM_152" :
+   {
+      "TECH_PARAM_DEC_ID" : "250",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "GPS time offset for BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_GpsTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "GPS time offset used to adjust all BGC times of the cycle (it is the GPS time offset set before transmission of the previous cycle)."
+   },
+   "TECH_PARAM_153" :
+   {
+      "TECH_PARAM_DEC_ID" : "251",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "Time offset for descending profile BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_DescProfTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "Estimated time offset used to adjust descending profile BGC times."
+   },
+   "TECH_PARAM_154" :
+   {
+      "TECH_PARAM_DEC_ID" : "252",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "Time offset for ascending profile BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_AscProfTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "Estimated time offset used to adjust ascending profile BGC times."
    }
 }
diff --git a/decArgo_soft/config/_techParamNames/_tech_param_name_128.csv b/decArgo_soft/config/_techParamNames/_tech_param_name_128.csv
@@ -151,3 +151,6 @@ TECH_PARAM_DEC_ID;TECH_PARAM_MSG_ID;TECH_PARAM_MSG_LABEL;TECH_PARAM_NAME;TECH_PA
 181;TECH_AUX;Date de detection de glace;TECH_AUX_CLOCK_IceDetection_YYYYMMDDHHMMSS;Time of ice detection.
 182;TECH_AUX;Immersion de detection de glace;TECH_AUX_PRES_IceDetection_dbar;Pressure of ice detection.
 183;TECH_AUX;End of life;TECH_AUX_CLOCK_EndOfLifeAlarm_YYYYMMDDHHMMSS;Alarm raised when the float switches to the End Of Life mode. When reported as a NUMBER, it provides the reason of the End Of Life (see float manual for details).
+250;TECH_AUX;GPS time offset for BGC times;TECH_AUX_TIME_GpsTimeOffsetForBgcTimeAdj_seconds;GPS time offset used to adjust all BGC times of the cycle (it is the GPS time offset set before transmission of the previous cycle).
+251;TECH_AUX;Time offset for descending profile BGC times;TECH_AUX_TIME_DescProfTimeOffsetForBgcTimeAdj_seconds;Estimated time offset used to adjust descending profile BGC times.
+252;TECH_AUX;Time offset for ascending profile BGC times;TECH_AUX_TIME_AscProfTimeOffsetForBgcTimeAdj_seconds;Estimated time offset used to adjust ascending profile BGC times.
diff --git a/decArgo_soft/config/_techParamNames/_tech_param_name_128.json b/decArgo_soft/config/_techParamNames/_tech_param_name_128.json
@@ -1214,5 +1214,29 @@
       "TECH_PARAM_MSG_LABEL" : "End of life",
       "TECH_PARAM_NAME" : "TECH_AUX_CLOCK_EndOfLifeAlarm_YYYYMMDDHHMMSS",
       "TECH_PARAM_DESCRIPTION" : "Alarm raised when the float switches to the End Of Life mode. When reported as a NUMBER, it provides the reason of the End Of Life (see float manual for details)."
+   },
+   "TECH_PARAM_153" :
+   {
+      "TECH_PARAM_DEC_ID" : "250",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "GPS time offset for BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_GpsTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "GPS time offset used to adjust all BGC times of the cycle (it is the GPS time offset set before transmission of the previous cycle)."
+   },
+   "TECH_PARAM_154" :
+   {
+      "TECH_PARAM_DEC_ID" : "251",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "Time offset for descending profile BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_DescProfTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "Estimated time offset used to adjust descending profile BGC times."
+   },
+   "TECH_PARAM_155" :
+   {
+      "TECH_PARAM_DEC_ID" : "252",
+      "TECH_PARAM_MSG_ID" : "TECH_AUX",
+      "TECH_PARAM_MSG_LABEL" : "Time offset for ascending profile BGC times",
+      "TECH_PARAM_NAME" : "TECH_AUX_TIME_AscProfTimeOffsetForBgcTimeAdj_seconds",
+      "TECH_PARAM_DESCRIPTION" : "Estimated time offset used to adjust ascending profile BGC times."
    }
 }
diff --git a/decArgo_soft/soft/sub/add_rtqc_to_profile_file.m b/decArgo_soft/soft/sub/add_rtqc_to_profile_file.m
@@ -194,10 +194,12 @@
 %   16/08/2021 - RNU - V 5.5: To follow Virginie Racapé's recomendation,
 %                             TEST 25: MEDD test is not performed on (PRES,
 %                             TEMP_DOXY) profiles
-%   10/28/2021 - RNU - V 3.6: Code improvement:
+%   10/28/2021 - RNU - V 5.6: Code improvement:
 %                             - improve efficiency in retrieveing paramDataMode
 %                             - improve efficiency while reporting profile QC in
 %                             trajectory
+%   01/03/2022 - RNU - V 5.7: Exclude NaN values from get_gebco_elev_point
+%                             output
 % ------------------------------------------------------------------------------
 function add_rtqc_to_profile_file(a_floatNum, ...
    a_ncMonoProfInputPathFileName, a_ncMonoProfOutputPathFileName, ...
@@ -237,7 +239,7 @@ function add_rtqc_to_profile_file(a_floatNum, ...
 
 % program version
 global g_decArgo_addRtqcToProfileVersion;
-g_decArgo_addRtqcToProfileVersion = '5.6';
+g_decArgo_addRtqcToProfileVersion = '5.7';
 
 % Argo data start date
 janFirst1997InJulD = gregorian_2_julian_dec_argo('1997/01/01 00:00:00');
@@ -1706,7 +1708,7 @@ function add_rtqc_to_profile_file(a_floatNum, ...
                positionQc(idProf) = set_qc(positionQc(idProf), g_decArgo_qcStrGood);
                testDoneList(4, idProf) = 1;
                % apply the test
-               if (mean(mean(elev)) >= 0)
+               if (mean(mean(elev(~isnan(elev)))) >= 0)
                   if (positionQc(idProf) ~= g_decArgo_qcStrInterpolated)
                      positionQc(idProf) = set_qc(positionQc(idProf), g_decArgo_qcStrBad);
                   else

diff --git a/decArgo_soft/soft/sub/add_rtqc_to_trajectory_file.m b/decArgo_soft/soft/sub/add_rtqc_to_trajectory_file.m
@@ -121,6 +121,8 @@
 %                             locations
 %                             TEST 7 (regional range test) don't use Iridium
 %                             locations to determine region area
+%   01/03/2022 - RNU - V 3.4: Exclude NaN values from get_gebco_elev_point
+%                             output
 % ------------------------------------------------------------------------------
 function add_rtqc_to_trajectory_file(a_floatNum, ...
    a_ncTrajInputFilePathName, a_ncTrajOutputFilePathName, ...
@@ -159,7 +161,7 @@ function add_rtqc_to_trajectory_file(a_floatNum, ...
 
 % program version
 global g_decArgo_addRtqcToTrajVersion;
-g_decArgo_addRtqcToTrajVersion = '3.3';
+g_decArgo_addRtqcToTrajVersion = '3.4';
 
 % Argo data start date
 janFirst1997InJulD = gregorian_2_julian_dec_argo('1997/01/01 00:00:00');
@@ -906,7 +908,7 @@ function add_rtqc_to_trajectory_file(a_floatNum, ...
 
          if (~isempty(elev))
             % apply the test
-            if (mean(mean(elev)) >= 0)
+            if (mean(mean(elev(~isnan(elev)))) >= 0)
                positionQc(idNoDef(idPos)) = set_qc(positionQc(idNoDef(idPos)), g_decArgo_qcStrBad);
 
                testFailedList(4) = 1;