From 70d39f6477b3906b02210f43240504b2c76cedb4 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 20 Mar 2026 10:51:32 -0400 Subject: [PATCH 1/5] Verify MERRA2 location --- pre/remap_restart/remap_utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pre/remap_restart/remap_utils.py b/pre/remap_restart/remap_utils.py index 467fd80e..f9d8ac34 100755 --- a/pre/remap_restart/remap_utils.py +++ b/pre/remap_restart/remap_utils.py @@ -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), MERRA2_RST_BASE + " does not exist. Need to login discover30 or discover36 to access it" + yyyymm = int(x.get('input:shared:yyyymmddhh')[0:6]) if yyyymm < 197901 : exit("Error. MERRA-2 data < 1979 not available\n") From 1004a86845b05aa219f21d250f76d911c8dd10ef Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 20 Mar 2026 11:22:15 -0400 Subject: [PATCH 2/5] add catch_file --- pre/remap_restart/remap_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pre/remap_restart/remap_utils.py b/pre/remap_restart/remap_utils.py index f9d8ac34..3c5a73b6 100755 --- a/pre/remap_restart/remap_utils.py +++ b/pre/remap_restart/remap_utils.py @@ -181,6 +181,7 @@ 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:catch_tilefile'] = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles/GM4/geometry/CF0180x6C_DE1440xPE0720/CF0180x6C_DE1440xPE0720-Pfafstetter.til' return False From fa6245a7b2617fa0bf77d945d2cbdd5c9b8cdaf6 Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Fri, 20 Mar 2026 13:25:13 -0400 Subject: [PATCH 3/5] Edited error message about MERRA2_RST_BASE --- pre/remap_restart/remap_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre/remap_restart/remap_utils.py b/pre/remap_restart/remap_utils.py index 3c5a73b6..ae751336 100755 --- a/pre/remap_restart/remap_utils.py +++ b/pre/remap_restart/remap_utils.py @@ -152,7 +152,7 @@ def init_merra2(x): if not x.get('input:shared:MERRA-2') : return False - assert os.path.exists(MERRA2_RST_BASE), MERRA2_RST_BASE + " does not exist. Need to login discover30 or discover36 to access it" + 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 : From bd33a5695d77bbd561326c2e46dc720518b12323 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 20 Mar 2026 14:50:52 -0400 Subject: [PATCH 4/5] add wemin when remap does not go through questionaire --- pre/remap_restart/remap_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pre/remap_restart/remap_utils.py b/pre/remap_restart/remap_utils.py index 467fd80e..a145fe43 100755 --- a/pre/remap_restart/remap_utils.py +++ b/pre/remap_restart/remap_utils.py @@ -179,7 +179,7 @@ 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' return False def init_geosit(x): @@ -209,7 +209,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 From f40b6e388ad766f1b8a94e3847c792a416ec6de4 Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Fri, 20 Mar 2026 17:05:13 -0400 Subject: [PATCH 5/5] enhanced message for remapping from GEOS-IT and M-2 (works on discover only) --- pre/remap_restart/remap_questions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pre/remap_restart/remap_questions.py b/pre/remap_restart/remap_questions.py index 759b2198..a3281f20 100755 --- a/pre/remap_restart/remap_questions.py +++ b/pre/remap_restart/remap_questions.py @@ -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), },