Add oasim package

darwinproject · Jan 18, 2024 · 87dd4f7 · 87dd4f7
1 parent 2c7bf51
commit 87dd4f7
Show file tree

Hide file tree

Showing 41 changed files with 6,782 additions and 65 deletions.
diff --git a/model/inc/PARAMS.h b/model/inc/PARAMS.h
@@ -1065,6 +1065,7 @@ C-- Logical flags for selecting packages
       LOGICAL useRADTRANS
       LOGICAL usePTRACERS
       LOGICAL useGCHEM
+      LOGICAL useOASIM
       LOGICAL useRBCS
       LOGICAL useOffLine
       LOGICAL useMATRIX
@@ -1100,7 +1101,7 @@ C-- Logical flags for selecting packages
      &        useStreamIce, useICEFRONT, useThSIce, useLand,
      &        useATM2D, useAIM, useAtm_Phys, useFizhi, useGridAlt,
      &        useDiagnostics, useREGRID, useLayers, useMNC,
-     &        useRunClock, useEMBED_FILES,
+     &        useRunClock, useEMBED_FILES, useOASIM,
      &        useMYPACKAGE
 
 CEH3 ;;; Local Variables: ***

diff --git a/model/src/load_fields_driver.F b/model/src/load_fields_driver.F
@@ -37,6 +37,8 @@ SUBROUTINE LOAD_FIELDS_DRIVER( myTime, myIter, myThid )
 C       |
 C       |-- EXTERNAL_FIELDS_LOAD
 C       |
+C       |-- OASIM_FIELDS_LOAD
+C       |
 C       |-- RADTRANS_FIELDS_LOAD
 C       |
 C       |-- GCHEM_FIELDS_LOAD
@@ -177,6 +179,17 @@ SUBROUTINE LOAD_FIELDS_DRIVER( myTime, myIter, myThid )
         CALL TIMER_STOP ('EXTERNAL_FLDS_LOAD [LOAD_FLDS_DRIVER]',myThid)
       ENDIF
 
+#ifdef ALLOW_OASIM
+      IF ( useOASIM ) THEN
+#ifdef ALLOW_DEBUG
+        IF (debugMode) CALL DEBUG_CALL('OASIM_FIELDS_LOAD',myThid)
+#endif /* ALLOW_DEBUG */
+        CALL TIMER_START('OASIM_FIELDS_LOAD  [LOAD_FLDS_DRIVER]',myThid)
+        CALL OASIM_FIELDS_LOAD( .TRUE., myTime, myIter, myThid )
+        CALL TIMER_STOP ('OASIM_FIELDS_LOAD  [LOAD_FLDS_DRIVER]',myThid)
+      ENDIF
+#endif /* ALLOW_OASIM */
+
 #ifdef ALLOW_RADTRANS
       IF ( useRADTRANS ) THEN
 #ifdef ALLOW_DEBUG

diff --git a/model/src/packages_boot.F b/model/src/packages_boot.F
@@ -72,6 +72,7 @@ SUBROUTINE PACKAGES_BOOT( myThid )
      &          useRADTRANS,
      &          usePTRACERS,
      &          useGCHEM,
+     &          useOASIM,
      &          useRBCS,
      &          useOffLine,
      &          useMATRIX,
@@ -137,6 +138,7 @@ SUBROUTINE PACKAGES_BOOT( myThid )
       useRADTRANS     =.FALSE.
       usePTRACERS     =.FALSE.
       useGCHEM        =.FALSE.
+      useOASIM        =.FALSE.
       useRBCS         =.FALSE.
       useOffLine      =.FALSE.
       useMATRIX       =.FALSE.

diff --git a/model/src/packages_check.F b/model/src/packages_check.F
@@ -296,6 +296,12 @@ SUBROUTINE PACKAGES_CHECK( myThid )
       IF (useFLT) CALL PACKAGES_ERROR_MSG('FLT',' ',myThid)
 #endif
 
+#ifdef ALLOW_OASIM
+      IF (useOASIM) CALL OASIM_CHECK( myThid )
+#else
+      IF (useOASIM) CALL PACKAGES_ERROR_MSG('OASIM',' ',myThid)
+#endif
+
 #ifdef ALLOW_RADTRANS
       IF (useRADTRANS) CALL RADTRANS_CHECK( myThid )
 #else

diff --git a/model/src/packages_init_fixed.F b/model/src/packages_init_fixed.F
@@ -70,6 +70,8 @@ SUBROUTINE PACKAGES_INIT_FIXED( myThid )
 C       |
 C       |-- FLT_INIT_FIXED
 C       |
+C       |-- OASIM_INIT_FIXED
+C       |
 C       |-- RADTRANS_INIT_FIXED
 C       |
 C       |-- LONGSTEP_INIT_FIXED
@@ -394,6 +396,15 @@ SUBROUTINE PACKAGES_INIT_FIXED( myThid )
       ENDIF
 #endif
 
+#ifdef ALLOW_OASIM
+      IF (useOASIM) THEN
+# ifdef ALLOW_DEBUG
+        IF (debugMode) CALL DEBUG_CALL('OASIM_INIT_FIXED',myThid)
+# endif
+        CALL OASIM_INIT_FIXED(myThid)
+      ENDIF
+#endif
+
 #ifdef ALLOW_RADTRANS
       IF (useRADTRANS) THEN
 # ifdef ALLOW_DEBUG

diff --git a/model/src/packages_init_variables.F b/model/src/packages_init_variables.F
@@ -64,7 +64,11 @@ SUBROUTINE PACKAGES_INIT_VARIABLES( myThid )
 C       |
 C       |-- FLT_INIT_VARIA
 C       |
-C       |-- RADTRANS_INIT_VARI
+C       |-- SUN_INIT_VARIA
+C       |
+C       |-- OASIM_INIT_VARIA
+C       |
+C       |-- RADTRANS_INIT_VARIA
 C       |
 C       |-- PTRACERS_INIT_VARIA
 C       |
@@ -323,6 +327,12 @@ SUBROUTINE PACKAGES_INIT_VARIABLES( myThid )
       CALL SUN_INIT_VARIA( myThid )
 #endif /* ALLOW_SUN */
 
+#ifdef ALLOW_OASIM
+      IF (useOASIM) THEN
+        CALL OASIM_INIT_VARIA( myThid )
+      ENDIF
+#endif /* ALLOW_OASIM */
+
 #ifdef ALLOW_RADTRANS
       IF (useRADTRANS) THEN
         CALL RADTRANS_INIT_VARIA( myThid )

diff --git a/model/src/packages_readparms.F b/model/src/packages_readparms.F
@@ -63,6 +63,8 @@ SUBROUTINE PACKAGES_READPARMS(myThid)
 C       |
 C       |-- FLT_READPARMS
 C       |
+C       |-- OASIM_READPARMS
+C       |
 C       |-- RADTRANS_READPARMS
 C       |
 C       |-- LONGSTEP_READPARMS
@@ -239,6 +241,10 @@ SUBROUTINE PACKAGES_READPARMS(myThid)
       CALL FLT_READPARMS( myThid )
 #endif /* ALLOW_FLT */
 
+#ifdef ALLOW_OASIM
+      IF (useOASIM) CALL OASIM_READPARMS( myThid )
+#endif
+
 #ifdef ALLOW_RADTRANS
 C--   if useRADTRANS=T, set RADTRANS parameters; otherwise just return
       CALL RADTRANS_READPARMS( myThid )