Skip to content
4 changes: 2 additions & 2 deletions pre/remap_restart/remap_questions.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ def ask_questions():
{
"type": "confirm",
"name": "input:shared:GEOS-IT",
"message": "Remap from archived GEOS-IT restarts?\n",
"message": "Remap from archived GEOS-IT restarts? (Works only on NCCS/Discover.)\n",
"default": False,
"when": lambda x: SITE_GEOSIT(x),
},
{
"type": "confirm",
"name": "input:shared:MERRA-2",
"message": "Remap from archived MERRA-2 restarts?\n",
"message": "Remap from archived MERRA-2 restarts? (Works only on NCCS/Discover nodes discover[30,36].)\n",
"default": False,
"when": lambda x: SITE_MERRA2(x) and not x.get("input:shared:GEOS-IT") and os.path.isdir(MERRA2_RST_BASE),
},
Expand Down
6 changes: 5 additions & 1 deletion pre/remap_restart/remap_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@
def init_merra2(x):
if not x.get('input:shared:MERRA-2') : return False

assert os.path.exists(MERRA2_RST_BASE), "Must be on discover30 or discover36 to access MERRA-2 restarts at " + MERRA2_RST_BASE

yyyymm = int(x.get('input:shared:yyyymmddhh')[0:6])
if yyyymm < 197901 :
exit("Error. MERRA-2 data < 1979 not available\n")
Expand Down Expand Up @@ -179,6 +181,8 @@ def init_merra2(x):
x['input:shared:stretch'] = False
x['input:shared:rst_dir'] = x['output:shared:out_dir'] + '/merra2_tmp_'+x['input:shared:yyyymmddhh']+'/'
x['input:air:nlevel'] = 72
x['input:surface:wemin'] = '26'
x['input:surface:catch_tilefile'] = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles/GM4/geometry/CF0180x6C_DE1440xPE0720/CF0180x6C_DE1440xPE0720-Pfafstetter.til'

return False

Expand Down Expand Up @@ -209,7 +213,7 @@ def init_geosit(x):
x['input:shared:stretch'] = False
x['input:shared:rst_dir'] = x['output:shared:out_dir'] + '/geosit_tmp_'+x['input:shared:yyyymmddhh']+'/'
x['input:air:nlevel'] = 72

x['input:surface:wemin'] = '13'
return False


Expand Down
Loading