Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
4e973ab
Added Gaea C5 features
Feb 12, 2025
ff1c851
test
DavidBurrows-NCO Feb 19, 2025
2f73cd6
Merge branch 'NOAA-EMC:develop' into c5c6
DavidBurrows-NCO Feb 19, 2025
e8f070c
first round of C5 and C6 updates
DavidBurrows-NCO Feb 19, 2025
ef4b303
module files for c5 and c6
DavidBurrows-NCO Feb 19, 2025
bdacb00
Added GAEA C5 & C6
Feb 20, 2025
70ca298
Updated gaea c5/c6
Feb 20, 2025
b317f0d
updates for runnings step2
DavidBurrows-NCO Feb 20, 2025
1b65b02
update c5 Core module ver
DavidBurrows-NCO Feb 21, 2025
04558a5
Updated GAEA C6 dirs paths
Feb 24, 2025
ba1d9f5
Gaea C6 Dir path updated
Feb 24, 2025
df5dd6b
swap python
DavidBurrows-NCO Feb 26, 2025
1adf890
update c5/c6 nodes
DavidBurrows-NCO Feb 26, 2025
647218b
add C5/C6 to plotting scripts and cartopy
DavidBurrows-NCO Feb 26, 2025
c7ee013
Merge pull request #1 from NOAA-EMC/develop
AnilKumar-NOAA Mar 3, 2025
2dbef6c
Merge branch 'features_gaea' into c5c6
DavidBurrows-NCO Mar 3, 2025
08b4b18
Merge pull request #2 from NOAA-EPIC/c5c6
AnilKumar-NOAA Mar 3, 2025
bdf7c58
clean up suggested by Dave H.
DavidBurrows-NCO Mar 3, 2025
e5dc250
remove extra fix def
DavidBurrows-NCO Mar 3, 2025
a004d39
add partition
DavidBurrows-NCO Mar 3, 2025
7cd6468
Updated Gaea paths under role.glopara
Mar 7, 2025
45e0b71
updated gaeac5 corrections
Mar 7, 2025
7a60135
updated 9.1 to 9.1.3 under ush/load_module.sh
Mar 7, 2025
a3e29cf
Updated gaeac5/c6 paths
Mar 7, 2025
69e41e2
Added gaea c5/c6 cartopy paths
Mar 7, 2025
6993e29
Updated gaeac5/c6 paths
Mar 7, 2025
f14b89a
Merge branch 'NOAA-EMC:develop' into features_gaea
AnilKumar-NOAA Mar 7, 2025
842fb0d
Merge branch 'features_gaea' into verif_updates_mar3
DavidBurrows-NCO Mar 10, 2025
6349fb2
Merge pull request #6 from NOAA-EPIC/verif_updates_mar3
AnilKumar-NOAA Mar 10, 2025
5162160
plotting scripts updates
DavidBurrows-NCO Mar 10, 2025
3d6aa18
Merge pull request #7 from NOAA-EPIC/verif_updates_mar3
AnilKumar-NOAA Mar 10, 2025
d4e6043
remove duplicate code
DavidBurrows-NCO Mar 10, 2025
623581a
Merge pull request #8 from NOAA-EPIC/verif_updates_mar3
AnilKumar-NOAA Mar 10, 2025
cfe1bb1
fix C5 fix path
DavidBurrows-NCO Mar 17, 2025
3f553f9
Merge pull request #9 from DavidBurrows-NCO/march17_updates
AnilKumar-NOAA Mar 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ EMC_verif-global is supported on the following machines:
* Orion
* S4
* Jet
* Gaea-C5
* Gaea-C6

For questions or issues, please e-mail Mallory Row at mallory.row@noaa.gov.

Expand Down
38 changes: 38 additions & 0 deletions modulefiles/emc_verif_global_gaeac5.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
help([[
Load environment to run EMC_verif-global on Gaea-C5 using Intel
]])

prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
load(pathJoin("stack-intel", stack_intel_ver))

Core_ver=os.getenv("Core_ver") or "24.10"
load(pathJoin("Core", Core_ver))

prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
load(pathJoin("prod_util", prod_util_ver))

grib_util_ver=os.getenv("grib_util_ver") or "1.3.0"
load(pathJoin("grib-util", grib_util_ver))

intel_oneapi_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))

netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
load(pathJoin("netcdf-c", netcdf_c_ver))

nco_ver=os.getenv("nco_ver") or "5.1.9"
load(pathJoin("nco", nco_ver))

grads_ver=os.getenv("grads_ver") or "2.2.3"
load(pathJoin("grads", grads_ver))

imagemagick_ver=os.getenv("imagemagick_ver") or "7.1.1-29"
load(pathJoin("imagemagick", imagemagick_ver))

met_ver=os.getenv("met_ver") or "9.1.3"
load(pathJoin("met", met_ver))

metplus_ver=os.getenv("metplus_ver") or "3.1.1"
load(pathJoin("metplus", metplus_ver))
38 changes: 38 additions & 0 deletions modulefiles/emc_verif_global_gaeac6.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
help([[
Load environment to run EMC_verif-global on Gaea-C6 using Intel
]])

prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
load(pathJoin("stack-intel", stack_intel_ver))

Core_ver=os.getenv("Core_ver") or "24.11"
load(pathJoin("Core", Core_ver))

prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
load(pathJoin("prod_util", prod_util_ver))

grib_util_ver=os.getenv("grib_util_ver") or "1.3.0"
load(pathJoin("grib-util", grib_util_ver))

intel_oneapi_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))

netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
load(pathJoin("netcdf-c", netcdf_c_ver))

nco_ver=os.getenv("nco_ver") or "5.1.9"
load(pathJoin("nco", nco_ver))

grads_ver=os.getenv("grads_ver") or "2.2.3"
load(pathJoin("grads", grads_ver))

imagemagick_ver=os.getenv("imagemagick_ver") or "7.1.1-29"
load(pathJoin("imagemagick", imagemagick_ver))

met_ver=os.getenv("met_ver") or "9.1.3"
load(pathJoin("met", met_ver))

metplus_ver=os.getenv("metplus_ver") or "3.1.1"
load(pathJoin("metplus", metplus_ver))
2 changes: 1 addition & 1 deletion scripts/exgrid2grid_step1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exgrid2grid_step2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exgrid2obs_step1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exgrid2obs_step2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exmaps2d.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exmapsda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exprecip_step1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERCULES -o $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then
elif [ $machine = HERCULES -o $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exprecip_step2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exsatellite_step1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
2 changes: 1 addition & 1 deletion scripts/exsatellite_step2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
4 changes: 2 additions & 2 deletions scripts/extropcyc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down Expand Up @@ -131,7 +131,7 @@ if [ $MPMD = YES ]; then
if [ $machine = WCOSS2 ]; then
export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH
launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp"
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES ]; then
elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET -o $machine = HERCULES -o $machine = GAEAC5 -o $machine = GAEAC6 ]; then
launcher="srun --export=ALL --multi-prog"
fi
$launcher $MP_CMDFILE
Expand Down
12 changes: 11 additions & 1 deletion ush/build_webpage.py
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,16 @@ def tropcyc_write_template_body2(template_filename):
+'--partition='+QUEUESERV+' --account='+ACCOUNT+' '
+'--output='+web_job_output+' '
+'--job-name='+web_job_name+' '+web_job_filename)
elif machine == 'GAEAC5':
os.system('sbatch --ntasks=1 --time='+walltime.strftime('%H:%M:%S')+' '
+'--clusters='+CLUSTERS+' --account='+ACCOUNT+' '
+'--output='+web_job_output+' '
+'--job-name='+web_job_name+' '+web_job_filename)
elif machine == 'GAEAC6':
os.system('sbatch --ntasks=1 --time='+walltime.strftime('%H:%M:%S')+' '
+'--clusters='+CLUSTERS+' --account='+ACCOUNT+' '
+'--output='+web_job_output+' '
+'--job-name='+web_job_name+' '+web_job_filename)
elif machine == 'JET':
if webhost == 'emcrzdm.ncep.noaa.gov':
print("ERROR: Currently "+machine.title()+" cannot connect to "
Expand All @@ -953,7 +963,7 @@ def tropcyc_write_template_body2(template_filename):
+'--partition='+QUEUESERV+' --account='+ACCOUNT+' '
+'--output='+web_job_output+' '
+'--job-name='+web_job_name+' '+web_job_filename)
elif machine in ["ORION", "HERCULES", "S4"]:
elif machine in ["ORION", "HERCULES", "S4","GAEAC5","GAEAC6"]:
if webhost == 'emcrzdm.ncep.noaa.gov':
print("ERROR: Currently " + machine + " cannot connect to "+webhost)
else:
Expand Down
6 changes: 3 additions & 3 deletions ush/create_METplus_job_scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -1920,7 +1920,7 @@ def create_job_scripts_maps(start_date_dt, end_date_dt, case, case_abbrev,
node = 1
while njob <= njob_files:
job = 'job'+str(njob)
if machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES']:
if machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES', 'GAEAC5', 'GAEAC6']:
if iproc >= nproc:
poe_file.close()
iproc = 0
Expand All @@ -1930,7 +1930,7 @@ def create_job_scripts_maps(start_date_dt, end_date_dt, case, case_abbrev,
if iproc == 0:
poe_file = open(poe_filename, 'w')
iproc+=1
if machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES']:
if machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES', 'GAEAC5', 'GAEAC6']:
poe_file.write(
str(iproc-1)+' '
+os.path.join(DATA, RUN, 'metplus_job_scripts', job)+'\n'
Expand All @@ -1947,7 +1947,7 @@ def create_job_scripts_maps(start_date_dt, end_date_dt, case, case_abbrev,
poe_file = open(poe_filename, 'a')
iproc+=1
while iproc <= nproc:
if machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES']:
if machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES', 'GAEAC5', 'GAEAC6']:
poe_file.write(
str(iproc-1)+' /bin/echo '+str(iproc)+'\n'
)
Expand Down
6 changes: 3 additions & 3 deletions ush/get_data_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def wget_data(wget_job_filename, wget_job_name, wget_job_output):
+'-l select=1:ncpus=1 '+wget_job_filename)
job_check_cmd = ('qselect -s QR -u '+os.environ['USER']+' '
+'-N '+wget_job_name+' | wc -l')
elif machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES']:
elif machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES', 'GAEAC5', 'GAEAC6']:
os.system('sbatch --ntasks=1 --time='
+walltime.strftime('%H:%M:%S')+' --partition='+QUEUESERV+' '
+'--account='+ACCOUNT+' --output='+wget_job_output+' '
Expand Down Expand Up @@ -460,9 +460,9 @@ def get_hpss_data(hpss_job_filename, save_data_dir, save_data_file,
+'--job-name='+hpss_job_name+' '+hpss_job_filename)
job_check_cmd = ('squeue -u '+os.environ['USER']+' -n '
+hpss_job_name+' -t R,PD -h | wc -l')
elif machine in ['ORION', 'S4', 'HERCULES']:
elif machine in ['ORION', 'S4', 'HERCULES', 'GAEAC5', 'GAEAC6']:
print("ERROR: No HPSS access from "+machine)
if machine not in ['ORION', 'S4', 'HERCULES']:
if machine not in ['ORION', 'S4', 'HERCULES', 'GAEAC5', 'GAEAC6']:
sleep_counter, sleep_checker = 1, 10
while (sleep_counter*sleep_checker) <= walltime_seconds:
sleep(sleep_checker)
Expand Down
8 changes: 7 additions & 1 deletion ush/get_machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
print("BEGIN: "+os.path.basename(__file__))

EMC_verif_global_machine_list = [
'HERA', 'ORION', 'S4', 'JET', 'WCOSS2', 'HERCULES'
'HERA', 'ORION', 'S4', 'JET', 'WCOSS2', 'HERCULES', 'GAEAC5', 'GAEAC6'
]

# Read in environment variables
Expand Down Expand Up @@ -57,6 +57,8 @@
)
s4_match = re.match(re.compile(r"s4-submit.ssec.wisc.edu"), hostname)
jet_match = re.match(re.compile(r"^fe[0-9]{1}"), hostname)
gaeac5_match = re.match(re.compile(r"^gaea5[1-8]{1}"), hostname)
gaeac6_match = re.match(re.compile(r"^gaea6[1-8]{1}"), hostname)
Comment thread
AnilKumar-NOAA marked this conversation as resolved.
if cactus_match or dogwood_match or cactus_match2 or dogwood_match2:
machine = 'WCOSS2'
elif hera_match:
Expand All @@ -69,6 +71,10 @@
machine = 'S4'
elif jet_match:
machine = 'JET'
elif gaeac5_match:
machine = 'GAEAC5'
elif gaeac6_match:
machine = 'GAEAC6'
else:
print("Cannot find match for "+hostname)
sys.exit(1)
Expand Down
38 changes: 37 additions & 1 deletion ush/load_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ elif [ $machine = HERA ]; then
module use ${HOMEverif_global}/modulefiles
module load emc_verif_global_hera
if [ $MET_version = 9.1 ]; then
export HOMEMET="/contrib/met/9.1"
export HOMEMET="/contrib/met/9.1.3"
export HOMEMET_bin_exec="bin"
else
"ERROR: $MET_version is not supported on $machine"
Expand Down Expand Up @@ -120,6 +120,42 @@ elif [ $machine = JET ]; then
"ERROR: $METplus_version is not supported on $machine"
exit 1
fi
elif [ $machine = GAEAC5 ]; then
module reset
module use ${HOMEverif_global}/modulefiles
module load emc_verif_global_gaeac5
module swap python/3.11.6 python/3.9
if [[ "${MET_version}" =~ ^(9.1) ]]; then
export HOMEMET="${met_ROOT}"
export HOMEMET_bin_exec="bin"
else
"ERROR: $MET_version is not supported on $machine"
exit 1
fi
if [[ "${METplus_version}" =~ ^(3.1) ]]; then
export HOMEMETplus="${metplus_ROOT}"
else
"ERROR: $METplus_version is not supported on $machine"
exit 1
fi
elif [ $machine = GAEAC6 ]; then
module reset
module use ${HOMEverif_global}/modulefiles
module load emc_verif_global_gaeac6
module swap python/3.11.6 python/3.11
Comment thread
AnilKumar-NOAA marked this conversation as resolved.
if [ $MET_version = 9.1 ]; then
export HOMEMET="${met_ROOT}"
export HOMEMET_bin_exec="bin"
else
"ERROR: $MET_version is not supported on $machine"
exit 1
fi
if [ $METplus_version = 3.1 ]; then
export HOMEMETplus="${metplus_ROOT}"
else
"ERROR: $METplus_version is not supported on $machine"
exit 1
fi
else
echo "ERROR: $machine is not supported"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion ush/load_to_METviewer_AWS.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
+'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+AWS_job_output+' '
+'-e '+AWS_job_output+' -N '+AWS_job_name+' '
+'-l select=1:ncpus=1 '+AWS_job_filename)
elif machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES']:
elif machine in ['HERA', 'ORION', 'S4', 'JET', 'HERCULES', 'GAEAC5', 'GAEAC6']:
os.system('sbatch --ntasks=1 --time='+walltime.strftime('%H:%M:%S')+' '
+'--partition='+QUEUESERV+' --account='+ACCOUNT+' '
+'--output='+AWS_job_output+' '
Expand Down
14 changes: 9 additions & 5 deletions ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,19 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat,
if machine == 'WCOSS2':
config['data_dir']='/u/emc.vpppg/.local/share/cartopy'
elif machine == 'HERA':
config['data_dir']='/home/Mallory.Row/.local/share/cartopy'
config['data_dir']='/scratch1/NCEPDEV/global/glopara/data/metplus.data/cartopy'
elif machine == 'S4':
config['data_dir']='/data/prod/glopara/contrib/share/cartopy'
elif machine == 'JET':
config['data_dir']='/home/Mallory.Row/.local/share/cartopy'
elif machine == 'ORION':
config['data_dir']='/home/mrow/.local/share/cartopy'
elif machine == 'HERCULES':
config['data_dir']='/home/dhuber/.local/share/cartopy'
elif machine == 'ORION':
config['data_dir']='/work2/noaa/global/role-global/data/metplus.data/cartopy'
elif machine == 'HERCULES':
config['data_dir']='/work2/noaa/global/role-global/data/metplus.data/cartopy'
elif machine == 'GAEAC5':
config['data_dir']='/gpfs/f5/nggps_emc/world-shared/role.glopara/DATA/metplus.data/cartopy'
elif machine == 'GAEAC6':
config['data_dir']='/gpfs/f6/drsa-precip3/world-shared/role.glopara/data/metplus.data/cartopy'

# Set up information
env_var_model_list = []
Expand Down
Loading