From a06a10d0dd8ef95768792a409000f25055b9f1c0 Mon Sep 17 00:00:00 2001 From: cameronbook Date: Mon, 4 Nov 2024 23:44:48 +0000 Subject: [PATCH] Fix rocoto_create_entried since HSD arg was removed in last commit. --- tests-dev/create_xml.py | 2 +- tests-dev/logs/RegressionTests_hera.log | 46 ++-------------------- tests-dev/test_cases/exp_conf/2020_CAPE.IN | 3 +- 3 files changed, 6 insertions(+), 45 deletions(-) diff --git a/tests-dev/create_xml.py b/tests-dev/create_xml.py index d1e684f18f..4ab47c6e82 100644 --- a/tests-dev/create_xml.py +++ b/tests-dev/create_xml.py @@ -4,7 +4,7 @@ import yaml from ufs_test_utils import get_testcase, write_logfile, rrmdir, machine_check_off -def rocoto_create_entries(RTPWD,MACHINE_ID,INPUTDATA_ROOT,INPUTDATA_ROOT_WW3,INPUTDATA_ROOT_BMIC,RUNDIR_ROOT,NEW_BASELINE,ROCOTO_XML): +def rocoto_create_entries(RTPWD,MACHINE_ID,INPUTDATA_ROOT,INPUTDATA_ROOT_WW3,INPUTDATA_ROOT_BMIC,HSD_INPUT_DATA,RUNDIR_ROOT,NEW_BASELINE,ROCOTO_XML): """Generate header information for Rocoto XML file Args: diff --git a/tests-dev/logs/RegressionTests_hera.log b/tests-dev/logs/RegressionTests_hera.log index 11da9e3967..c19f8f8ddd 100644 --- a/tests-dev/logs/RegressionTests_hera.log +++ b/tests-dev/logs/RegressionTests_hera.log @@ -1,48 +1,8 @@ ====START OF hera REGRESSION TESTING LOG==== UFSWM hash used in testing: -326cff4a338b46624b264e35230a9d19ea8808a0 +e36f418cde76f94261c54aed7c0f6efeec3048d0 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) - 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 + 37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 ../AQM (v0.2.0-37-g37cbb7d) + be5d28fd1b60522e6fc98aefeead20e6aac3530b ../AQM/src/model/CMAQ \ No newline at end of file diff --git a/tests-dev/test_cases/exp_conf/2020_CAPE.IN b/tests-dev/test_cases/exp_conf/2020_CAPE.IN index 21fc6b5b91..d7d05e8309 100644 --- a/tests-dev/test_cases/exp_conf/2020_CAPE.IN +++ b/tests-dev/test_cases/exp_conf/2020_CAPE.IN @@ -24,7 +24,8 @@ if [ $WARM_START = .false. ]; then elif [ "$V2_SFC_FILE" = "true" ]; then cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/. elif [ "$HSD_CASE" = "true" ]; then - cp -r @[HSD_INPUT_DATA]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/. + #cp -r @[HSD_INPUT_DATA]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/. + cp -r /scratch1/NCEPDEV/stmp4/Cameron.Book/2461_testing/tmp_c48/FV3_input_data48/INPUT_L127_v2_sfc/* ./INPUT/. else cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/. fi