Merge pull request #28 from GEOS-ESM/develop

Sync main with develop

Author: mathomp4

MIT_GEOS5PlugMod/MIT_GEOS5PlugMod.F90

@@ -1272,6 +1272,9 @@ subroutine Finalize ( gc, import, export, clock, rc )
     call MAPL_GenericFinalize( GC, IMPORT, EXPORT, CLOCK, RC=status )
     VERIFY_(STATUS)
 
+    call MAPL_TimerOff(MAPL,"FINALIZE")
+    call MAPL_TimerOff(MAPL,"TOTAL"   )
+ 
 ! All Done
 !---------
 

MIT_GEOS5PlugMod/configs/c12_cs32_01/code/CPP_EEOPTIONS.h

@@ -1,3 +1,6 @@
+#ifndef _CPP_EEOPTIONS_H_
+#define _CPP_EEOPTIONS_H_
+
 CBOP
 C     !ROUTINE: CPP_EEOPTIONS.h
 C     !INTERFACE:
@@ -28,9 +31,6 @@ C     |       options set at compile time.                       |
 C     *==========================================================*
 CEOP
 
-#ifndef _CPP_EEOPTIONS_H_
-#define _CPP_EEOPTIONS_H_
-
 C     In general the following convention applies:
 C     ALLOW  - indicates an feature will be included but it may
 C     CAN      have a run-time flag to allow it to be switched
@@ -62,9 +62,6 @@ C--   Control use of "double" precision constants.
 C     Use D0 where it means REAL*8 but not where it means REAL*16
 #define D0 d0
 
-C--   Enable some old macro conventions for backward compatibility
-#undef USE_OLD_MACROS_R4R8toRSRL
-
 C=== IO related options ===
 C--   Flag used to indicate whether Fortran formatted write
 C     and read are threadsafe. On SGI the routines can be thread
@@ -108,7 +105,6 @@ CXXX #undef  ALLOW_USE_MPI
 
 C--   Control use of communication that might overlap computation.
 C     Under MPI selects/deselects "non-blocking" sends and receives.
-#define ALLOW_ASYNC_COMMUNICATION
 #undef  ALLOW_ASYNC_COMMUNICATION
 #undef  ALWAYS_USE_ASYNC_COMMUNICATION
 C--   Control use of communication that is atomic to computation.
@@ -154,7 +150,7 @@ C     allow to import and export from/to Coupler interface.
 C--   Activate some pieces of code for coupling to GEOS AGCM
 #define HACK_FOR_GMAO_CPL
 
-#endif /* _CPP_EEOPTIONS_H_ */
-
+C=== And define Macros ===
 #include "CPP_EEMACROS.h"
 
+#endif /* _CPP_EEOPTIONS_H_ */

MIT_GEOS5PlugMod/configs/c12_cs32_01/code/CPP_OPTIONS.h

@@ -35,10 +35,10 @@ C o Include pressure loading code
 #undef ATMOSPHERIC_LOADING
 
 C o Include/exclude balancing surface forcing fluxes code
-#define ALLOW_BALANCE_FLUXES
+#undef ALLOW_BALANCE_FLUXES
 
 C o Include/exclude balancing surface forcing relaxation code
-#define ALLOW_BALANCE_RELAX
+#undef ALLOW_BALANCE_RELAX
 
 C o Include/exclude checking for negative salinity
 #undef CHECK_SALINITY_FOR_NEGATIVE_VALUES
@@ -49,15 +49,27 @@ C o Exclude/allow external forcing-fields load
 C   this allows to read & do simple linear time interpolation of oceanic
 C   forcing fields, if no specific pkg (e.g., EXF) is used to compute them.
 #undef EXCLUDE_FFIELDS_LOAD
+C   If defined, use same method (with pkg/autodiff compiled or not) for checking
+C   when to load new reccord ; by default, use simpler method with pkg/autodiff.
+#undef STORE_LOADEDREC_TEST
 
 C o Include/exclude phi_hyd calculation code
 #define INCLUDE_PHIHYD_CALCULATION_CODE
 
+C o Include/exclude sound speed calculation code
+C o (Note that this is a diagnostic from Del Grasso algorithm, not derived
+C    from EOS)
+#undef INCLUDE_SOUNDSPEED_CALC_CODE
+
 C-- Vertical mixing code options:
 
-C o Include/exclude call to S/R CONVECT
+C o Include/exclude calling S/R CONVECTIVE_ADJUSTMENT
 #define INCLUDE_CONVECT_CALL
 
+C o Include/exclude calling S/R CONVECTIVE_ADJUSTMENT_INI, turned off by
+C   default because it is an unpopular historical left-over
+#undef INCLUDE_CONVECT_INI_CALL
+
 C o Include/exclude call to S/R CALC_DIFFUSIVITY
 #define INCLUDE_CALC_DIFFUSIVITY_CALL
 
@@ -73,17 +85,24 @@ C   either from grid-spacing reduction effect or as artificially enhanced mixing
 C   near surface & bottom for too thin grid-cell
 #undef EXCLUDE_PCELL_MIX_CODE
 
+C o Exclude/allow to use isotropic 3-D Smagorinsky viscosity as diffusivity
+C   for tracers (after scaling by constant Prandtl number)
+#undef ALLOW_SMAG_3D_DIFFUSIVITY
+
 C-- Time-stepping code options:
 
 C o Include/exclude combined Surf.Pressure and Drag Implicit solver code
-#define ALLOW_SOLVE4_PS_AND_DRAG
+#undef ALLOW_SOLVE4_PS_AND_DRAG
 
 C o Include/exclude Implicit vertical advection code
 #define INCLUDE_IMPLVERTADV_CODE
 
 C o Include/exclude AdamsBashforth-3rd-Order code
 #undef ALLOW_ADAMSBASHFORTH_3
 
+C o Include/exclude Quasi-Hydrostatic Stagger Time-step AdamsBashforth code
+#undef ALLOW_QHYD_STAGGER_TS
+
 C-- Model formulation options:
 
 C o Allow/exclude "Exact Convervation" of fluid in Free-Surface formulation
@@ -93,6 +112,9 @@ C   that ensures that d/dt(eta) is exactly equal to - Div.Transport
 C o Allow the use of Non-Linear Free-Surface formulation
 C   this implies that grid-cell thickness (hFactors) varies with time
 #define NONLIN_FRSURF
+C o Disable code for rStar coordinate and/or code for Sigma coordinate
+c#define DISABLE_RSTAR_CODE
+#define DISABLE_SIGMA_CODE
 
 C o Include/exclude nonHydrostatic code
 #undef ALLOW_NONHYDROSTATIC
@@ -102,18 +124,21 @@ C o Include/exclude GM-like eddy stress in momentum code
 
 C-- Algorithm options:
 
-C o Use Non Self-Adjoint (NSA) conjugate-gradient solver
+C o Include/exclude code for Non Self-Adjoint (NSA) conjugate-gradient solver
 #undef ALLOW_CG2D_NSA
 
 C o Include/exclude code for single reduction Conjugate-Gradient solver
-#define ALLOW_SRCG
+#undef ALLOW_SRCG
 
 C o Choices for implicit solver routines solve_*diagonal.F
 C   The following has low memory footprint, but not suitable for AD
 #undef SOLVE_DIAGONAL_LOWMEMORY
 C   The following one suitable for AD but does not vectorize
 #undef SOLVE_DIAGONAL_KINNER
 
+C   Implementation alternative (might be faster on some platforms ?)
+#undef USE_MASK_AND_NO_IF
+
 C-- Retired code options:
 
 C o ALLOW isotropic scaling of harmonic and bi-harmonic terms when
@@ -127,7 +152,7 @@ C   The preferred method is specifying a value for viscAhGrid or viscA4Grid
 C   in data which is then automatically scaled by the grid size;
 C   the old method of specifying viscAh/viscA4 and this flag is provided
 C   for completeness only (and for use with the adjoint).
-C#define ISOTROPIC_COS_SCALING
+c#define ISOTROPIC_COS_SCALING
 
 C o This flag selects the form of COSINE(lat) scaling of bi-harmonic term.
 C *only for use on a lat-lon grid*
@@ -137,7 +162,7 @@ C   Setting this flag here affects both momentum and tracer equation unless
 C   it is set/unset again in other header fields (e.g., GAD_OPTIONS.h).
 C   The definition of the flag is commented to avoid interference with
 C   such other header files.
-C#define COSINEMETH_III
+c#define COSINEMETH_III
 
 C o Use "OLD" UV discretisation near boundaries (*not* recommended)
 C   Note - only works with pkg/mom_fluxform and "no_slip_sides=.FALSE."
@@ -149,10 +174,6 @@ C   Default is to use "new" grid files (OLD_GRID_IO undef) but OLD_GRID_IO
 C   is still useful with, e.g., single-domain curvilinear configurations.
 #undef OLD_GRID_IO
 
-C o Use thsice+seaice (old) call sequence: ice-Dyn,ice-Advect,ice-Thermo(thsice)
-C              as opposed to new sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect
-#undef OLD_THSICE_CALL_SEQUENCE
-
 C o Use old EXTERNAL_FORCING_U,V,T,S subroutines (for backward compatibility)
 #undef USE_OLD_EXTERNAL_FORCING
 

MIT_GEOS5PlugMod/configs/c12_cs32_01/code/SEAICE_LAYERS.h

@@ -72,6 +72,13 @@ C     oceWeight    :: grid-cell ocean fraction from GEOS [0-1]
       _RL oceWeight(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
       COMMON /DIAGS_GMAO_CPL/
      &        oceWeight
+
+C     SI_FRZMLT    :: available heat (W/m^2) to freeze (>0) or melt (<0) sea ice
+C                     so that surface level ocean reaches freezing temperature
+      _RL SI_FRZMLT(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
+      COMMON /SEAICE_FRZMLT/
+     &        SI_FRZMLT
+
 #endif /* HACK_FOR_GMAO_CPL */
 
 CEH3 ;;; Local Variables: ***