From a94f332c8e7f5ec19e0809ca12f860534318b026 Mon Sep 17 00:00:00 2001 From: Taylor Roper Date: Thu, 24 Apr 2025 20:25:54 +0000 Subject: [PATCH 1/5] add dump dir; enable loading prepobs and fit2obs --- dev/workflow/hosts/awspw.yaml | 6 +++--- modulefiles/module_base.noaacloud.lua | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dev/workflow/hosts/awspw.yaml b/dev/workflow/hosts/awspw.yaml index b353f002730..24d09950485 100644 --- a/dev/workflow/hosts/awspw.yaml +++ b/dev/workflow/hosts/awspw.yaml @@ -1,7 +1,7 @@ # Paths -DMPDIR: '' # TODO: This does not yet exist. -BASE_GIT: '' #TODO: This does not yet exist. -BASE_DATA: '/bucket/global-workflow-shared-data' +DMPDIR: '${DATAMOUNT:-/bucket}/dump' # TODO: Seek approval. +BASE_GIT: '/contrib/git' #TODO: Seek approval. +BASE_DATA: 'contrib/global-workflow-shared-data' BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR' AERO_INPUTS_DIR: /contrib/global-workflow-shared-data/data/GEFS_ExtData/20250310 PACKAGEROOT: '' #TODO: This does not yet exist. diff --git a/modulefiles/module_base.noaacloud.lua b/modulefiles/module_base.noaacloud.lua index 3a7cc75d7ac..a71424219ab 100644 --- a/modulefiles/module_base.noaacloud.lua +++ b/modulefiles/module_base.noaacloud.lua @@ -42,11 +42,10 @@ load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None"))) setenv("WGRIB2","wgrib2") setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None")) ---prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")) ---prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles")) ---load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None"))) +prepend_path("MODULEPATH", "/contrib/git/prepobs/modulefiles") +load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None"))) ---prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles")) ---load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) +prepend_path("MODULEPATH", "/contrib/git/Fit2Obs/modulefiles") +load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) whatis("Description: GFS run environment") From fd08e3594bf302e18deacd9c91a290bad9b98d12 Mon Sep 17 00:00:00 2001 From: Taylor Roper Date: Mon, 28 Apr 2025 20:50:56 +0000 Subject: [PATCH 2/5] fix accidental edit --- dev/workflow/hosts/awspw.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/workflow/hosts/awspw.yaml b/dev/workflow/hosts/awspw.yaml index 24d09950485..7131f47e0a7 100644 --- a/dev/workflow/hosts/awspw.yaml +++ b/dev/workflow/hosts/awspw.yaml @@ -1,7 +1,7 @@ # Paths DMPDIR: '${DATAMOUNT:-/bucket}/dump' # TODO: Seek approval. BASE_GIT: '/contrib/git' #TODO: Seek approval. -BASE_DATA: 'contrib/global-workflow-shared-data' +BASE_DATA: '/bucket/global-workflow-shared-data' BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR' AERO_INPUTS_DIR: /contrib/global-workflow-shared-data/data/GEFS_ExtData/20250310 PACKAGEROOT: '' #TODO: This does not yet exist. From b1b06cc865242506990e4afdc40ceca969674d1f Mon Sep 17 00:00:00 2001 From: Taylor Roper Date: Thu, 1 May 2025 15:41:14 +0000 Subject: [PATCH 3/5] enabling MAKE_NSSTBUFR on cloud --- dev/workflow/hosts/awspw.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/workflow/hosts/awspw.yaml b/dev/workflow/hosts/awspw.yaml index 7131f47e0a7..3ebdfa33c76 100644 --- a/dev/workflow/hosts/awspw.yaml +++ b/dev/workflow/hosts/awspw.yaml @@ -21,7 +21,7 @@ CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported. HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below. ARCHCOM_TO: 'local' ATARDIR: '' # TODO: This will not yet work from AWS. -CHGRP_RSTPROD: 'YES' +CHGRP_RSTPROD: 'NO' #TODO: rstprod group not yet supported. CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported. # Features SUPPORTED_RESOLUTIONS: ['C48', 'C96', 'C192', 'C384', 'C768'] # TODO: Test and support all cubed-sphere resolutions. @@ -29,5 +29,5 @@ DO_ARCHCOM: 'NO' DO_TRACKER: 'NO' DO_GENESIS: 'NO' DO_METP: 'NO' -MAKE_NSSTBUFR: 'NO' +MAKE_NSSTBUFR: 'YES' MAKE_ACFTBUFR: 'NO' From d82b28c012e11332e77511f980aba8a54a300ae7 Mon Sep 17 00:00:00 2001 From: Taylor Roper Date: Mon, 12 May 2025 15:59:15 +0000 Subject: [PATCH 4/5] updating awspw host yaml file for prep job configurations on cloud --- dev/workflow/hosts/awspw.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dev/workflow/hosts/awspw.yaml b/dev/workflow/hosts/awspw.yaml index 3ebdfa33c76..e0b1aac36fb 100644 --- a/dev/workflow/hosts/awspw.yaml +++ b/dev/workflow/hosts/awspw.yaml @@ -1,6 +1,6 @@ # Paths -DMPDIR: '${DATAMOUNT:-/bucket}/dump' # TODO: Seek approval. -BASE_GIT: '/contrib/git' #TODO: Seek approval. +DMPDIR: '${DATA_MOUNT:-/bucket}/dump' +BASE_GIT: '/contrib/git' BASE_DATA: '/bucket/global-workflow-shared-data' BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR' AERO_INPUTS_DIR: /contrib/global-workflow-shared-data/data/GEFS_ExtData/20250310 @@ -15,8 +15,6 @@ SCHEDULER: slurm QUEUE: batch PARTITION_BATCH: compute PARTITION_SERVICE: process -CHGRP_RSTPROD: 'YES' -CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported. # HPSS properties HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below. ARCHCOM_TO: 'local' From 5c5dca497f5648851c989cda1cdace88c0a4c6bd Mon Sep 17 00:00:00 2001 From: Taylor Roper Date: Mon, 12 May 2025 16:38:23 +0000 Subject: [PATCH 5/5] removing loading fit2obs on noaalcoud; update in separate PR --- modulefiles/module_base.noaacloud.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/module_base.noaacloud.lua b/modulefiles/module_base.noaacloud.lua index a71424219ab..da704952462 100644 --- a/modulefiles/module_base.noaacloud.lua +++ b/modulefiles/module_base.noaacloud.lua @@ -45,7 +45,7 @@ setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None")) prepend_path("MODULEPATH", "/contrib/git/prepobs/modulefiles") load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None"))) -prepend_path("MODULEPATH", "/contrib/git/Fit2Obs/modulefiles") -load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) +--prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles")) +--load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) whatis("Description: GFS run environment")