Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Model configure defaults #22

Merged
merged 6 commits into from
Jan 10, 2020
Merged

Model configure defaults #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48f6fab
update .gitmodules
DusanJovic-NOAA Dec 27, 2019
259d34d
Remove variables from model_configure which have defaults set in sour…
DusanJovic-NOAA Dec 27, 2019
6718db3
set default calendar to gregorian
DusanJovic-NOAA Dec 27, 2019
73b9c35
update regression test baselines on hera
DusanJovic-NOAA Dec 27, 2019
b7c6a30
Update FV3 submodule
DusanJovic-NOAA Jan 3, 2020
ae92c4c
Update FV3 and NEMS submodules
DusanJovic-NOAA Jan 9, 2020
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: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+4 −3 fv3_cap.F90
+8 −6 module_fcst_grid_comp.F90
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 2 files
+1 −0 src/MAIN_NEMS.F90
+2 −0 src/module_NEMS_GRID_COMP.F90
6 changes: 0 additions & 6 deletions parm/model_configure.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
total_member: @[ENS_NUM]
print_esmf: .true.
PE_MEMBER01: @[TASKS]
start_year: @[SYEAR]
Expand All @@ -8,12 +7,8 @@ start_hour: @[SHOUR]
start_minute: 0
start_second: 0
nhours_fcst: @[FHMAX]
RUN_CONTINUE: .false.
ENS_SPS: .false.

dt_atmos: @[DT_ATMOS]
calendar: 'julian'
cpl: @[CPL]
memuse_verbose: .false.
atmos_nthreads: @[THRD]
use_hyper_thread: .false.
Expand All @@ -25,7 +20,6 @@ quilting: @[QUILTING]
write_groups: @[WRITE_GROUP]
write_tasks_per_group: @[WRTTASK_PER_GROUP]
output_history: @[OUTPUT_HISTORY]
write_dopost: @[WRITE_DOPOST]
num_files: @[NUM_FILES]
filename_base: @[FILENAME_BASE]
output_grid: @[OUTPUT_GRID]
Expand Down
798 changes: 397 additions & 401 deletions tests/Compile_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Dec 13 15:49:56 UTC 2019
Fri Dec 27 20:11:31 UTC 2019
Start Regression test


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/ufs-public-release-20191212/fv3_gfs_v15p2_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_119164/fv3_ccpp_gfs_v15p2_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/ufs-public-release-20191227/fv3_gfs_v15p2_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_73137/fv3_ccpp_gfs_v15p2_prod
Checking test 001 fv3_ccpp_gfs_v15p2 results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -70,8 +70,8 @@ Checking test 001 fv3_ccpp_gfs_v15p2 results ....
Test 001 fv3_ccpp_gfs_v15p2 PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/ufs-public-release-20191212/fv3_gfs_v16beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_119164/fv3_ccpp_gfs_v16beta_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/ufs-public-release-20191227/fv3_gfs_v16beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_73137/fv3_ccpp_gfs_v16beta_prod
Checking test 002 fv3_ccpp_gfs_v16beta results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -138,18 +138,18 @@ Checking test 002 fv3_ccpp_gfs_v16beta results ....
Test 002 fv3_ccpp_gfs_v16beta PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/ufs-public-release-20191212/fv3_gfs_v15p2_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_119164/fv3_ccpp_gfs_v15p2_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/ufs-public-release-20191227/fv3_gfs_v15p2_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_73137/fv3_ccpp_gfs_v15p2_debug_prod
Checking test 003 fv3_ccpp_gfs_v15p2_debug results ....
Test 003 fv3_ccpp_gfs_v15p2_debug PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/ufs-public-release-20191212/fv3_gfs_v16beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_119164/fv3_ccpp_gfs_v16beta_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/ufs-public-release-20191227/fv3_gfs_v16beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_73137/fv3_ccpp_gfs_v16beta_debug_prod
Checking test 004 fv3_ccpp_gfs_v16beta_debug results ....
Test 004 fv3_ccpp_gfs_v16beta_debug PASS


REGRESSION TEST WAS SUCCESSFUL
Fri Dec 13 16:12:43 UTC 2019
Elapsed time: 00h:22m:48s. Have a nice day!
Fri Dec 27 20:35:09 UTC 2019
Elapsed time: 00h:23m:41s. Have a nice day!
4 changes: 2 additions & 2 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,9 @@ while getopts ":cfsl:mkreh" opt; do
done

if [[ $MACHINE_ID = cheyenne.* ]]; then
RTPWD=${RTPWD:-$DISKNM/ufs-public-release-20191212/${COMPILER^^}}
RTPWD=${RTPWD:-$DISKNM/ufs-public-release-20191227/${COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/ufs-public-release-20191212}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/ufs-public-release-20191227}
fi

shift $((OPTIND-1))
Expand Down