decArgo_patch_20220401_047i commit

euroargodev · Nov 24, 2022 · c8726c0 · c8726c0
1 parent f74d436
commit c8726c0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/decArgo_soft/soft/sub/init_default_values.m b/decArgo_soft/soft/sub/init_default_values.m
@@ -486,7 +486,7 @@ function init_default_values(varargin)
 % the first 3 digits are incremented at each new complete dated release
 % the last digit is incremented at each patch associated to a given complete
 % dated release
-g_decArgo_decoderVersion = '047h';
+g_decArgo_decoderVersion = '047i';
 
 % list of managed decoders
 

diff --git a/decArgo_soft/soft/sub/update_float_config_ir_sbd_222_223_225.m b/decArgo_soft/soft/sub/update_float_config_ir_sbd_222_223_225.m
@@ -218,11 +218,23 @@ function update_float_config_ir_sbd_222_223_225(a_floatParam, a_cycleNum)
          % remove temporary static parameters
          g_decArgo_floatConfig.STATIC.NAMES(idDel) = [];
          g_decArgo_floatConfig.STATIC.VALUES(idDel) = [];
-
+
+         % check if the first MC01 cycles are done
+         if (floatInternalCycleNumber < nbCyclesFirstMission)
+            g_decArgo_doneOnceFlag = 2; % update after MC01 cycles should be considered once again
+         else
+            g_decArgo_doneOnceFlag = 1; % no need to check again until alternatePeriod or pressureIncrement are modified
+         end
+      end
+   end
+
+   % check if the first MC01 cycles are done
+   if (g_decArgo_doneOnceFlag == 2)
+      if (floatInternalCycleNumber >= nbCyclesFirstMission)
          g_decArgo_doneOnceFlag = 1; % no need to check again until alternatePeriod or pressureIncrement are modified
       end
    end
-   
+
    % update PX00
    if (floatInternalCycleNumber > 0)
 

diff --git a/decArgo_soft/soft/sub/update_float_config_ir_sbd_224.m b/decArgo_soft/soft/sub/update_float_config_ir_sbd_224.m
@@ -219,6 +219,18 @@ function update_float_config_ir_sbd_224(a_floatParam, a_cycleNum)
          g_decArgo_floatConfig.STATIC.NAMES(idDel) = [];
          g_decArgo_floatConfig.STATIC.VALUES(idDel) = [];
 
+         % check if the first MC01 cycles are done
+         if (floatInternalCycleNumber < nbCyclesFirstMission)
+            g_decArgo_doneOnceFlag = 2; % update after MC01 cycles should be considered once again
+         else
+            g_decArgo_doneOnceFlag = 1; % no need to check again until alternatePeriod or pressureIncrement are modified
+         end
+      end
+   end
+
+   % check if the first MC01 cycles are done
+   if (g_decArgo_doneOnceFlag == 2)
+      if (floatInternalCycleNumber >= nbCyclesFirstMission)
          g_decArgo_doneOnceFlag = 1; % no need to check again until alternatePeriod or pressureIncrement are modified
       end
    end