Update noaacloud machine config.

ufs-community · Oct 24, 2024 · a094204 · a094204
1 parent 326cff4
commit a094204
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 35 deletions.
diff --git a/tests-dev/logs/RegressionTests_hera.log b/tests-dev/logs/RegressionTests_hera.log
@@ -1,30 +1,48 @@
 ====START OF hera REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-283e9fb52df250052dbcf826e06adb87e66cf0bf
+326cff4a338b46624b264e35230a9d19ea8808a0
 
 Submodule hashes used in testing:
- 37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 ../AQM (v0.2.0-37-g37cbb7d)
- be5d28fd1b60522e6fc98aefeead20e6aac3530b ../AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-198-gbe5d28fd1)
- 1f9eaaa142c8b07ed6b788c9f44ea02cc86d0bae ../CDEPS-interface/CDEPS (cdeps0.4.17-42-g1f9eaaa)
- 5e57a89cf533fe98352bcfd1a464b1d50713274d ../CICE-interface/CICE (CICE6.0.0-378-g5e57a89)
- 05ac0ec3ea666080eed36e67f6cf8ce1255b243f ../CICE-interface/CICE/icepack (Icepack1.1.0-192-g05ac0ec)
- 24e9eed4ffe8138bef635c8f916f91b142595675 ../CMEPS-interface/CMEPS (cmeps_v0.4.1-2311-g24e9eed)
- cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 ../CMakeModules (v1.0.0-28-gcabd775)
- 1e10d62a971e4114faea90ae2f134664f3a9ef02 ../FV3 (remotes/origin/production/HREF.v3beta-341-g1e10d62)
- 24686a2561f1414eb86c7b97c93960c36e4257b1 ../FV3/atmos_cubed_sphere (201912_public_release-406-g24686a2)
- 0f8232724975c13289cad390c9a71fa2c6a9bff4 ../FV3/ccpp/framework (2024-07-11-dev)
- f3eeb3442775b7239d98e3d09acc6d4f1d42233e ../FV3/ccpp/physics (EP4-889-gf3eeb344)
- 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 ../FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 6f5dd627d124ae94bb5ed7f5afd22f82c470b1b7 ../FV3/upp (upp_v10.2.0-230-g6f5dd627)
--1ba8270870947b583cd51bc72ff8960f4c1fb36e ../FV3/upp/sorc/libIFI.fd
--529f870d33b65c3b6c1aa3c3236b94efc3bd336d ../FV3/upp/sorc/ncep_post.fd/post_gtg.fd
- 041422934cae1570f2f0e67239d5d89f11c6e1b7 ../GOCART (sdr_v2.1.2.6-119-g0414229)
- bcf7777bb037ae2feb2a8a8ac51aacb3511b52d9 ../HYCOM-interface/HYCOM (2.3.00-122-gbcf7777)
- c4d2337d8607ec994b3cd61179eb974e0a237841 ../LM4-driver (baseline_change_240904-6-gc4d2337)
- c03c4f68816030f726785daf0db6150aa1e9cc6f ../LM4-driver/LM4 (land_lad2_2021.02)
- 5e0c21f64fa5b20efc8f29f8709766e1e6793a79 ../MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10230-g5e0c21f64)
- 9423197f894112edfcb1502245f7d7b873d551f9 ../MOM6-interface/MOM6/pkg/CVMix-src (9423197)
- 29e64d652786e1d076a05128c920f394202bfe10 ../MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
- 3ac32f0db7a2a97d930f44fa5f060c983ff31ee8 ../NOAHMP-interface/noahmp (v3.7.1-436-g3ac32f0)
- c7004b658b9dae9fc473d4e6511dfc1cf8e6a7bd ../WW3 (6.07.1-347-gc7004b65)
+ 37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
+ be5d28fd1b60522e6fc98aefeead20e6aac3530b AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-198-gbe5d28fd1)
+ 1f9eaaa142c8b07ed6b788c9f44ea02cc86d0bae CDEPS-interface/CDEPS (cdeps0.4.17-42-g1f9eaaa)
+ 5e57a89cf533fe98352bcfd1a464b1d50713274d CICE-interface/CICE (CICE6.0.0-378-g5e57a89)
+ 05ac0ec3ea666080eed36e67f6cf8ce1255b243f CICE-interface/CICE/icepack (Icepack1.1.0-192-g05ac0ec)
+ 24e9eed4ffe8138bef635c8f916f91b142595675 CMEPS-interface/CMEPS (cmeps_v0.4.1-2311-g24e9eed)
+ cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
+ 1e10d62a971e4114faea90ae2f134664f3a9ef02 FV3 (remotes/origin/production/HREF.v3beta-341-g1e10d62)
+ 24686a2561f1414eb86c7b97c93960c36e4257b1 FV3/atmos_cubed_sphere (201912_public_release-406-g24686a2)
+ 0f8232724975c13289cad390c9a71fa2c6a9bff4 FV3/ccpp/framework (2024-07-11-dev)
+ f3eeb3442775b7239d98e3d09acc6d4f1d42233e FV3/ccpp/physics (EP4-889-gf3eeb344)
+ 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
+ 6f5dd627d124ae94bb5ed7f5afd22f82c470b1b7 FV3/upp (upp_v10.2.0-230-g6f5dd627)
+-1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
+-529f870d33b65c3b6c1aa3c3236b94efc3bd336d FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+ 041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
+ bcf7777bb037ae2feb2a8a8ac51aacb3511b52d9 HYCOM-interface/HYCOM (2.3.00-122-gbcf7777)
+ c4d2337d8607ec994b3cd61179eb974e0a237841 LM4-driver (baseline_change_240904-6-gc4d2337)
+ c03c4f68816030f726785daf0db6150aa1e9cc6f LM4-driver/LM4 (land_lad2_2021.02)
+ 5e0c21f64fa5b20efc8f29f8709766e1e6793a79 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10230-g5e0c21f64)
+ 9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
+ 29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
+ 3ac32f0db7a2a97d930f44fa5f060c983ff31ee8 NOAHMP-interface/noahmp (v3.7.1-436-g3ac32f0)
+ c7004b658b9dae9fc473d4e6511dfc1cf8e6a7bd WW3 (6.07.1-347-gc7004b65)
+ 05cad173feeb598431e3ef5f17c2df6562c8d101 fire_behavior (v0.2.0-1-g05cad17)
+ fad2fe9f42f6b7f744b128b4a2a9433f91e4296f stochastic_physics (ufs-v2.0.0-219-gfad2fe9)
+
+NOTES:
+[Times](Memory) are at the end of each compile/test in format [MM:SS](Size).
+The first time is for the full script (prep+run+finalize).
+The second time is specifically for the run phase.
+Times/Memory will be empty for failed tests.
+
+BASELINE DIRECTORY: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20241011
+COMPARISON DIRECTORY: /scratch1/NCEPDEV/stmp2/Cameron.Book/FV3_RT/rt_928444
+
+UFS_TEST.SH OPTIONS USED:
+* (-a) - HPC PROJECT ACCOUNT: epic
+* (-c) - CREATE NEW BASELINES
+* (-n) - RUN SINGLE TEST: 2020_CAPE intel
+* (-k) - KEEP RUN DIRECTORY
+* (-r) - USE ROCOTO
diff --git a/tests-dev/machine_config/machine_noaacloud.config b/tests-dev/machine_config/machine_noaacloud.config
@@ -3,11 +3,14 @@ set -eux
 
 export PATH=/contrib/EPIC/bin:${PATH}
 module use /apps/modules/modulefiles
-module load rocoto/1.3.3
+module use /contrib/EPIC/rocoto/modulefiles
 
-ROCOTORUN=/apps/rocoto/1.3.3/bin/rocotorun
-ROCOTOSTAT=/apps/rocoto/1.3.3/bin/rocotostat
-ROCOTOCOMPLETE=/apps/rocoto/1.3.3/bin/rocotocomplete
+module load intelpython/2023.2.0
+module load rocoto/1.3.7
+
+ROCOTORUN=/contrib/EPIC/rocoto/1.3.7/bin/rocotorun
+ROCOTOSTAT=/contrib/EPIC/rocoto/1.3.7/bin/rocotostat
+ROCOTOCOMPLETE=/contrib/EPIC/rocoto/1.3.7/bin/rocotocomplete
 ROCOTO_SCHEDULER=slurm
 export ROCOTORUN
 export ROCOTOSTAT

diff --git a/tests-dev/test_cases/test_cases.yaml b/tests-dev/test_cases/test_cases.yaml
@@ -3,6 +3,6 @@ test_cases_intel:
     compiler: 'intel'
     option: '-DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON'
   tests:
-    - 2020_CAPE: {'project':['daily'],'turnoff':['noaacloud']}
-    - 2020_CAPE_C768: {'project':['daily'],'turnoff':['noaacloud']}
-    - baroclinic_wave: {'project':['daily'],'turnoff':['noaacloud']}
+    - 2020_CAPE: {'project':['test_case'],'turnoff':['noaacloud']}
+    - 2020_CAPE_C768: {'project':['test_case'],'turnoff':['noaacloud']}
+    - baroclinic_wave: {'project':['test_case'],'turnoff':['noaacloud']}
diff --git a/tests-dev/ufs_test.yaml b/tests-dev/ufs_test.yaml
@@ -436,9 +436,9 @@ test_cases_intel:
     compiler: 'intel'
     option: '-DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON'
   tests:
-    - 2020_CAPE: {'project':['daily'],'turnoff':['noaacloud']}
-    - 2020_CAPE_C768: {'project':['daily'],'turnoff':['noaacloud']}
-    - baroclinic_wave: {'project':['daily'],'turnoff':['noaacloud']}
+    - 2020_CAPE: {'project':['test_case'],'turnoff':['noaacloud']}
+    - 2020_CAPE_C768: {'project':['test_case'],'turnoff':['noaacloud']}
+    - baroclinic_wave: {'project':['test_case'],'turnoff':['noaacloud']}
 atm_gnu:
   build: 
     compiler: 'gnu'