Changeset 26744 for issm/trunk/test/MITgcm/code_4003/SHELFICE_OPTIONS.h

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/MITgcm/code_4003/SHELFICE_OPTIONS.h (modified) (1 diff)

issm/trunk/test/MITgcm/code_4003/SHELFICE_OPTIONS.h

@@ -16 +16 @@
 
 C     allow code for simple ISOMIP thermodynamics
-!#define ALLOW_ISOMIP_TD
+#undef ALLOW_ISOMIP_TD
 
 C     allow friction velocity-dependent transfer coefficient
 C     following Holland and Jenkins, JPO, 1999
 #define SHI_ALLOW_GAMMAFRICT
-C     in uStar expression, use wet-point method to average velocity
-C     at grid-cell center
-!#define SHI_USTAR_WETPOINT
 
+C     allow (vertical) remeshing whenever ocean top thickness factor
+C     exceeds thresholds
 #define ALLOW_SHELFICE_REMESHING
-#define SHI_USTAR_TOPDR
-#undef ALLOW_SHELFICE_GROUNDED_ICE
+C     and allow to print message to STDOUT when this happens
+#define SHELFICE_REMESH_PRINT
 
 #endif /* ALLOW_SHELFICE */