Merge branch 'feature/borescan_add_geosit' of github.com:GEOS-ESM/GEO…

…S_Util into feature/borescan_add_geosit
GEOS-ESM · Sep 17, 2024 · 0ea9f4c · 0ea9f4c
2 parents 7669eff + 0fca7d6
commit 0ea9f4c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/pre/remap_restart/remap_utils.py b/pre/remap_restart/remap_utils.py
@@ -187,16 +187,18 @@ def init_geosit(x):
   if not x.get('input:shared:GEOS-IT') : return False
 
   yyyymm = int(x.get('input:shared:yyyymmddhh')[0:6])
-  if yyyymm < 199701 :
-     exit("Error. GEOS-IT data < 1997 not available\n")
-  elif (yyyymm < 199701):
-     expid = "d5294_geosit_jan98"
-  elif (yyyymm < 200701):
-     expid = "d5294_geosit_jan08"
-  elif (yyyymm < 201701):
-     expid = "d5294_geosit_jan18"
+
+  if yyyymm < 199701:
+      exit("Error. GEOS-IT data < 1997 not available\n")
+  elif 199612 <= yyyymm <= 200712:
+      expid = "d5294_geosit_jan98"
+  elif 200801 <= yyyymm < 201801:
+      expid = "d5294_geosit_jan08"
+  elif yyyymm >= 201801:
+      expid = "d5294_geosit_jan18"  # For any date starting from 201801 and beyond
   else:
-     expid = "d5294_geosit_jan18"
+      exit("Error. GEOS-IT data not available for this date\n")
+
   x['input:shared:expid']        = expid
   x['input:shared:omodel']       = 'data'
   x['input:shared:agrid']        = 'C180'

diff --git a/pre/remap_restart/tests/amip_c180Toc90.yaml b/pre/remap_restart/tests/amip_c180Toc90.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     agrid: C180
     # (coupled) ocean model: data, MOM5, MOM6

diff --git a/pre/remap_restart/tests/c180Toc360.yaml b/pre/remap_restart/tests/c180Toc360.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6
     omodel: data

diff --git a/pre/remap_restart/tests/c24Toc12.yaml b/pre/remap_restart/tests/c24Toc12.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6
     omodel: data

diff --git a/pre/remap_restart/tests/c360Toc24.yaml b/pre/remap_restart/tests/c360Toc24.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     agrid: C360
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6

diff --git a/pre/remap_restart/tests/f522Toc360.yaml b/pre/remap_restart/tests/f522Toc360.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6
     omodel: data