Merge branch 'master' into darwin

.github/workflows/build_testing.yml

@@ -83,10 +83,10 @@ jobs:
    strategy:
      matrix:
       include:
+        - exp: "global_oce_latlon"
         - exp: "halfpipe_streamice"
         - exp: "hs94.1x64x5"
         - exp: "isomip"
-        - exp: "OpenAD"
         - exp: "tutorial_global_oce_biogeo"
         - exp: "tutorial_global_oce_optim"
         - exp: "tutorial_tracer_adjsens"

doc/examples/examples.rst

@@ -617,6 +617,13 @@ directories ``code_oad`` and ``input_oad`` respectively.
 #. :filelink:`global_oce_biogeo_bling <verification/global_oce_biogeo_bling>` - Based on standard forward experiment,
    TAF adjoint setup, uses package :filelink:`ecco <pkg/ecco>`.
 
+#. :filelink:`global_oce_latlon <verification/global_oce_latlon>` - Simple adjoint experiment (used also to test OpenAD compiler), TAF and OpenAD adjoint setups.
+   Also contains additional OpenAD adjoint setups:
+
+   - using package :filelink:`ggl90 <pkg/ggl90>` (:filelink:`input_oad.ggl90 <verification/global_oce_latlon/input_oad.ggl90>`).
+
+   - using package :filelink:`kpp <pkg/kpp>` (:filelink:`input_oad.kpp <verification/global_oce_latlon/input_oad.kpp>`).
+
 #. :filelink:`global_with_exf <verification/global_with_exf>` - Based on standard forward experiment, TAF adjoint setup.
 
 #. :filelink:`halfpipe_streamice<verification/halfpipe_streamice>` - Based on standard forward experiment, TAF and OpenAD adjoint setups.
@@ -642,13 +649,6 @@ directories ``code_oad`` and ``input_oad`` respectively.
    Also contains additional TAF adjoint setup
    with sea ice thermodynamics-only using :filelink:`pkg/thsice` (:filelink:`input_ad.thsice <verification/offline_exf_seaice/input_ad.thsice>`).
 
-#. :filelink:`OpenAD <verification/OpenAD>` - Simple adjoint experiment (used also to test OpenAD compiler), TAF and OpenAD adjoint setups.
-   Also contains additional OpenAD adjoint setups:
-
-   - using package :filelink:`ggl90 <pkg/ggl90>` (:filelink:`input_oad.ggl90 <verification/OpenAD/input_oad.ggl90>`).
-
-   - using package :filelink:`kpp <pkg/kpp>` (:filelink:`input_oad.kpp <verification/OpenAD/input_oad.kpp>`).
-
 #. :filelink:`tutorial_dic_adjoffline <verification/tutorial_dic_adjoffline>` - TAF adjoint setup of offline form of passive tracers coupled
    to the dissolved inorganic carbon biogeochemistry model (currently NOT documented as a tutorial experiment).
 

doc/tag-index

@@ -1,6 +1,40 @@
     Notes on tags used in MITgcmUV
     ==============================
 
+checkpoint68r (2023/08/02)
+o verification:
+  - adjust amplitude of perturbation (grdchk_eps) to improve Fwd/Adj gradient
+    check comparison in exp. global_ocean.90x40x15, global_with_exf & lab_sea ;
+  - change location of grad-check (away from freezing Temp) in exp. OpenAD
+    and rename experiment "OpenAD" to "global_oce_latlon".
+o pkg/ctrl + pkg/grdchk:
+  - define PARAMETER nobcs = 4 in CTRL_OBCS.h instead of SIZE.h ; update SIZE.h
+    of all code_ad/oad/tap verification exp.
+  - in pkg/grdchk, rename grdchk.h to GRDCHK.h and adjust src code to work
+    without "nobcs" when OBCS_ALLOW_CONTROL is undefined.
+o verification:
+  - Remove duplicated parameter files from input_tap/ dir and adjust prepare_run
+    accordingly ; remove few untested additional files (in OpenAD/ & lab_sea/).
+o pkg/seaice:
+  - rename ZMIN/ZMAX into SEAICE_ZMIN/ZMAX to avoid potential conflicts with kpp
+    variables with the same name ; rename swfracb into SEAICE_SWFrac ;
+  - fix a bug in computing SEAICE_SWFrac in pressure coordinates ; update exp.
+    global_ocean.cs32x15.in_p reference output.
+o pkg/seaice:
+  - SEAICE_USE_GROWTH_ADX: fix a bug related to flooding and fix budget closure
+    for linear free-surface case.
+o pkg/ecco:
+  - in cost_gencost_sshv4.F, enable to also process monthly data (previously,
+    only daily) for SSH cost.
+o pkg/ctrl:
+  - remove left-over and unused code within ALLOW_NONDIMENSIONAL_CONTROL_IO
+    (except in OBCS_CONTROL pack/unpack code); as a consequence, switch back
+    ALLOW_PACKUNPACK_METHOD2 to #undef in exp. tutorial_global_oce_optim.
+o pkgs:
+  - for local filenames, replace character*(80) by character*(MAX_LEN_FNAM)
+    declaration, where possible, especially in pkgs: autodiff, ctrl, ecco,
+    profiles, smooth & grdchk.
+
 checkpoint68q (2023/06/29)
 o pkg/ggl90:
   - non IDEMIX code: fix bug (missing hFac) in matrix coefficient computation ;

model/src/ini_curvilinear_grid.F

@@ -49,7 +49,7 @@ SUBROUTINE INI_CURVILINEAR_GRID( myThid )
       INTEGER fp
       _RL tmpFac, tmpFac2
 #ifdef ALLOW_MNC
-      CHARACTER*(80) mncFn
+      CHARACTER*(MAX_LEN_FNAM) mncFn
 #endif
 #ifndef OLD_GRID_IO
       INTEGER iG, jG, iL, iLen

pkg/autodiff/active_file_ad.F

@@ -97,7 +97,7 @@ subroutine adactive_read_xy(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL useCurrentDir
 CEOP
@@ -180,7 +180,7 @@ subroutine adactive_read_xyz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL useCurrentDir
 CEOP
@@ -263,7 +263,7 @@ subroutine adactive_read_xz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL useCurrentDir
 CEOP
@@ -346,7 +346,7 @@ subroutine adactive_read_yz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL useCurrentDir
 CEOP
@@ -432,14 +432,13 @@ subroutine adactive_read_1d(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER il
 CEOP
 
       adpref = 'ad'
       il   = ILNBLNK( active_var_file )
-      WRITE(fname(1:80),'(A)') ' '
-      WRITE(fname(1:2+il),'(2A)') adpref, active_var_file(1:il)
+      WRITE(fname,'(2A)') adpref, active_var_file(1:il)
 
       CALL ACTIVE_READ_1D_RL(
      &                 fname, adactive_var, active_var_length,
@@ -503,7 +502,7 @@ subroutine adactive_write_xy(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL globalFile
       LOGICAL useCurrentDir
@@ -577,7 +576,7 @@ subroutine adactive_write_xyz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL globalFile
       LOGICAL useCurrentDir
@@ -651,7 +650,7 @@ subroutine adactive_write_xz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL globalFile
       LOGICAL useCurrentDir
@@ -725,7 +724,7 @@ subroutine adactive_write_yz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL globalFile
       LOGICAL useCurrentDir
@@ -807,14 +806,13 @@ subroutine adactive_write_1d(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) adpref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER il
 CEOP
 
       adpref = 'ad'
       il   = ILNBLNK( active_var_file )
-      WRITE(fname(1:80),'(A)') ' '
-      WRITE(fname(1:2+il),'(2A)') adpref, active_var_file(1:il)
+      WRITE(fname,'(2A)') adpref, active_var_file(1:il)
 
       CALL ACTIVE_WRITE_1D_RL(
      &                 fname, adactive_var, active_var_length,

pkg/autodiff/active_file_control.F

@@ -86,7 +86,7 @@ SUBROUTINE ACTIVE_READ_3D_RL(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2)  adpref
-      CHARACTER*(80) adfname
+      CHARACTER*(MAX_LEN_FNAM) adfname
       INTEGER bi,bj
       INTEGER i,j,k
       INTEGER jRec
@@ -262,7 +262,7 @@ SUBROUTINE ACTIVE_READ_3D_RS(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2)  adpref
-      CHARACTER*(80) adfname
+      CHARACTER*(MAX_LEN_FNAM) adfname
       INTEGER bi,bj
       INTEGER i,j,k
       INTEGER jRec
@@ -436,7 +436,7 @@ SUBROUTINE ACTIVE_READ_1D_RL(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2)  adpref
-      CHARACTER*(80) adfname
+      CHARACTER*(MAX_LEN_FNAM) adfname
       INTEGER i, bi, bj
       INTEGER jRec
       INTEGER prec
@@ -601,7 +601,7 @@ SUBROUTINE ACTIVE_READ_1D_RS(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2)  adpref
-      CHARACTER*(80) adfname
+      CHARACTER*(MAX_LEN_FNAM) adfname
       INTEGER i, bi, bj
       INTEGER jRec
       INTEGER prec

pkg/autodiff/active_file_control_slice.F

@@ -84,7 +84,7 @@ SUBROUTINE ACTIVE_READ_XZ_RL(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2)  adpref
-      CHARACTER*(80) adfname
+      CHARACTER*(MAX_LEN_FNAM) adfname
       INTEGER bi,bj
       INTEGER i,k
       INTEGER prec
@@ -252,7 +252,7 @@ SUBROUTINE ACTIVE_READ_XZ_RS(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2)  adpref
-      CHARACTER*(80) adfname
+      CHARACTER*(MAX_LEN_FNAM) adfname
       INTEGER bi,bj
       INTEGER i,k
       INTEGER prec
@@ -419,7 +419,7 @@ SUBROUTINE ACTIVE_READ_YZ_RL(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2)  adpref
-      CHARACTER*(80) adfname
+      CHARACTER*(MAX_LEN_FNAM) adfname
       INTEGER bi,bj
       INTEGER j,k
       INTEGER prec
@@ -587,7 +587,7 @@ SUBROUTINE ACTIVE_READ_YZ_RS(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2)  adpref
-      CHARACTER*(80) adfname
+      CHARACTER*(MAX_LEN_FNAM) adfname
       INTEGER bi,bj
       INTEGER j,k
       INTEGER prec

pkg/autodiff/active_file_g.F

@@ -84,7 +84,7 @@ subroutine g_active_read_xy(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL useCurrentDir
 CEOP
@@ -165,7 +165,7 @@ subroutine g_active_read_xyz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL useCurrentDir
 CEOP
@@ -246,7 +246,7 @@ subroutine g_active_read_xz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL useCurrentDir
 CEOP
@@ -327,7 +327,7 @@ subroutine g_active_read_yz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL useCurrentDir
 CEOP
@@ -412,14 +412,13 @@ subroutine g_active_read_1d(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER il
 CEOP
 
       pref = 'g_'
       il   = ILNBLNK( active_var_file )
-      WRITE(fname,'(A)') ' '
-      WRITE(fname(1:2+il),'(2A)') pref, active_var_file(1:il)
+      WRITE(fname,'(2A)') pref, active_var_file(1:il)
 
       CALL ACTIVE_READ_1D_RL(
      &                 active_var_file, active_var, active_var_length,
@@ -485,7 +484,7 @@ subroutine g_active_write_xy(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL globalFile
       LOGICAL useCurrentDir
@@ -561,7 +560,7 @@ subroutine g_active_write_xyz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL globalFile
       LOGICAL useCurrentDir
@@ -637,7 +636,7 @@ subroutine g_active_write_xz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL globalFile
       LOGICAL useCurrentDir
@@ -713,7 +712,7 @@ subroutine g_active_write_yz(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER myNr
       LOGICAL globalFile
       LOGICAL useCurrentDir
@@ -796,14 +795,13 @@ subroutine g_active_write_1d(
 
 C     !LOCAL VARIABLES:
       CHARACTER*(2) pref
-      CHARACTER*(80) fname
+      CHARACTER*(MAX_LEN_FNAM) fname
       INTEGER il
 CEOP
 
       pref = 'g_'
       il   = ILNBLNK( active_var_file )
-      WRITE(fname,'(A)') ' '
-      WRITE(fname(1:2+il),'(2A)') pref, active_var_file(1:il)
+      WRITE(fname,'(2A)') pref, active_var_file(1:il)
 
       CALL ACTIVE_WRITE_1D_RL(
      &                 active_var_file, active_var, active_var_length,