Merge branch 'master' into darwin

doc/tag-index

@@ -1,6 +1,36 @@
     Notes on tags used in MITgcmUV
     ==============================
 
+checkpoint68u (2023/12/10)
+o pkg/seaice:
+  - new/improved LSR convergence criteria (CPP: SEAICE_ALLOW_LSR_FLEX, run-time:
+    SEAICEuseLSRflex) accounting for both Non-Lin and Linear solver residual;
+    tested in offline_exf_seaice.dyn_lsr; also add 2-D diagnostics for residual.
+o pkg/streamice:
+  - rename STREAMICE_PETSC.h to STREAMICE_PETSC_MOD.h and rename
+    STREAMICE_ARG_PETSC_mod code module to STREAMICE_PETSC_mod;
+  - include STREAMICE_PETSC_MOD.h in src files rather than the module directly:
+    this obviates the need for alphabetical order in names or serial compilation
+o pkg/bling:
+  - fix 2 small bugs in carbonate and aragonite saturation states: a) both Ksp
+    coeff are fct of log of temperature (and not log10); b) add missing unit
+    conversion factor to carbonate variable in OmegaC & OmegaAr calculation.
+o pkg/grdchk:
+  - new S/R to get CTRL var/file name from grdchk-index ; use it to simplify
+    (with new arguments) the 3 routines that handle CTRL var/file perturbations
+  - rename grdchk_init to grdchk_get_mask ; move GRDCHK_SUMMARY call ;
+  - report (in summary & in results section) CTRL var/file name used in grdchk.
+o pkg/dic:
+  - fix loading of forcing file for the case DIC_forcingCycle = 0 ;
+  - fix inconsistent timing params for loading initial surface-silica file ;
+  - clean-up initialise-varia level S/R, now all called from dic_init_varia.F
+    and move all forcing field initialisation to dic_ini_forcing.F ;
+  - read and process pickup_dic meta file with error/warning (depending on
+    pickupStrictlyMatch = T/F) if missing file or field.
+o pkg/ctrl:
+  - reduce pkg/ctrl/optim.h to just "optimcycle" and rename into OPTIMCYCLE.h ;
+  - keep optim_readparms.F namelist unchanged and define variables locally.
+
 checkpoint68t (2023/10/28)
 o pkg/dic:
   - improve carbonate dissolution options (new params: selectCalciteDissolution)

model/src/initialise_varia.F

@@ -118,7 +118,6 @@ SUBROUTINE INITIALISE_VARIA( myThid )
 # endif
 # ifdef ALLOW_CTRL
 #  include "CTRL_SIZE.h"
-#  include "optim.h"
 #  include "CTRL.h"
 #  include "CTRL_GENARR.h"
 #  include "CTRL_DUMMY.h"

model/src/packages_init_variables.F

@@ -134,7 +134,6 @@ SUBROUTINE PACKAGES_INIT_VARIABLES( myThid )
 # endif
 # ifdef ALLOW_CTRL
 #  include "CTRL_SIZE.h"
-#  include "optim.h"
 #  include "CTRL.h"
 #  include "CTRL_GENARR.h"
 #  include "CTRL_DUMMY.h"

model/src/the_main_loop.F

@@ -224,9 +224,6 @@ SUBROUTINE THE_MAIN_LOOP( myTime, myIter, myThid )
 #  include "KPP.h"
 c#  include "KPP_PARAMS.h"
 # endif
-# ifdef ALLOW_CTRL
-#  include "optim.h"
-# endif
 # ifdef ALLOW_TIMEAVE
 #  include "TIMEAVE_STATV.h"
 # endif

model/src/the_model_main.F

@@ -587,7 +587,7 @@ SUBROUTINE THE_MODEL_MAIN(myThid)
 #endif
 #ifdef ALLOW_CTRL
 # include "CTRL.h"
-# include "optim.h"
+# include "OPTIMCYCLE.h"
 #endif
 
 C     !INPUT/OUTPUT PARAMETERS:

model/src/update_masks_etc.F

@@ -48,7 +48,7 @@ SUBROUTINE UPDATE_MASKS_ETC( myThid )
 #include "SURFACE.h"
 Cml we need optimcycle for storing the new hFaC(C/W/S) and depth
 #ifdef ALLOW_AUTODIFF
-# include "optim.h"
+# include "OPTIMCYCLE.h"
 #endif
 
 C     !INPUT/OUTPUT PARAMETERS:

optim/optim.h

@@ -1,5 +1,3 @@
-
-
 c     ==================================================================
 c     HEADER OPTIMIZATION
 c     ==================================================================
@@ -32,8 +30,9 @@ c     lsoptversion - Version of the large scale optimization.
       character*(5)  lsoptversion
       parameter    ( lsoptversion = '2.1.0' )
 
-      character*(5)  offlineversion
-      parameter    ( offlineversion = '0.1.1' )
+      character*(5)  optimversion
+
+      parameter    ( optimversion = '0.1.1' )
 
 c     The off-line optimization part:
 c     ===============================
@@ -75,12 +74,6 @@ c     optimcycle - cycle number of the off-line optimization.
      &                    nondimcontrol
       logical nondimcontrol
 
-      common /optiparm_c/
-     &                    copt
-      character*( 3) copt
-
 c     ==================================================================
 c     END OF HEADER OPTIMIZATION
 c     ==================================================================
-
-

optim/optim_initmod.F

@@ -31,7 +31,7 @@ subroutine optim_initmod(
 
 #include "EEPARAMS.h"
 #include "SIZE.h"
-#include "ctrl.h"
+#include "CTRL.h"
 #include "optim.h"
 
 c     == routine arguments ==
@@ -56,11 +56,11 @@ subroutine optim_initmod(
 c     --> Presently not implemented, since the control vector and the
 c         gradient of the cost function can already be non-dimensionalized
 c         by *ecco_ControlPack* and *ecco_ControlUnPack*.
-c 
+c
 c         To do this set:
-c 
+c
 c           #define  USE_NONDIMENSIONAL_CONTROL_IO
-c 
+c
 c         in CPP_OPTIONS.h. The subroutine *ecco_ControlPack* will then
 c         non-dimensionalize its output and *ecco_ControlUnPack* will
 c         dimensionalize its input.

optim/optim_numbmod.F

@@ -44,7 +44,6 @@
 c
 c     ==================================================================
 
-
       subroutine optim_numbmod(
      O                    nn
      &                  )
@@ -75,7 +74,7 @@ subroutine optim_numbmod(
 #include "EEPARAMS.h"
 #include "SIZE.h"
 
-#include "ctrl.h"
+#include "CTRL.h"
 #include "optim.h"
 #include "minimization.h"
 #include "CTRL_OBCS.h"