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

Feature/ww3update #334

Merged
merged 22 commits into from
Dec 28, 2020
Merged

Feature/ww3update #334

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1194e12
update WW3 to the latest WW3/develop
Dec 7, 2020
0247552
edit rt.sh and fv3_conf to address new mod_defs
Dec 8, 2020
fd64963
edit fv_config files to define WW3 input direvtory
Dec 8, 2020
ba80e9b
edit rt.sh to avoid underscore neglection by bash
Dec 9, 2020
1044959
add log file for hera-intel
Dec 9, 2020
e10ed6d
test on orion
Dec 17, 2020
ff76911
add test log on hera
Dec 17, 2020
37cd4da
revert accnt for hera
Dec 17, 2020
49b2f47
edit rt.sh
Dec 18, 2020
125a601
Merge remote-tracking branch 'upstream/develop' into feature/WW3update
Dec 23, 2020
04ddaa8
run regtests on Orion
Dec 23, 2020
66beb3c
change develop date to 20201223
Dec 23, 2020
8de34af
add log file on cheyenne
Dec 23, 2020
b95d104
add log file for wcoss runs
Dec 24, 2020
9c052b8
add log file for jet
Dec 24, 2020
1e1836b
add log file on hera
Dec 24, 2020
22be9c2
add log file on orion
Dec 24, 2020
acba1b6
Merge branch 'feature/WW3update' of github.com:aliabdolali/ufs-weathe…
Dec 24, 2020
fff8110
add hera log file
Dec 24, 2020
d182ddc
add hera gnu log file
Dec 24, 2020
f60881a
add orion log file
Dec 28, 2020
8dd2ee2
add gaea log file
Dec 28, 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 WW3
Open in desktop
Submodule WW3 updated 107 files
8,135 changes: 3,958 additions & 4,177 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

7,560 changes: 3,668 additions & 3,892 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions tests/fv3_conf/ccpp_control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cp @[INPUTDATA_ROOT]/${inputdir}/*_table .
cp @[INPUTDATA_ROOT]/${inputdir}/*configure .

if [ $CPLWAV = .T. ]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/mod_def.* .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
fi
4 changes: 2 additions & 2 deletions tests/fv3_conf/ccpp_gfdlmp_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ cp @[INPUTDATA_ROOT]/FV3_input_data/field_table_gfdlmp field_table
cp @[INPUTDATA_ROOT]/FV3_input_data/*configure .

if [ $CPLWAV = .T. ]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/mod_def.* .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
fi
6 changes: 3 additions & 3 deletions tests/fv3_conf/ccpp_multigases_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cp @[INPUTDATA_ROOT]/${inputdir}/diag_table_multi_gases diag_table
cp @[INPUTDATA_ROOT]/${inputdir}/field_table_multi_gases field_table

if [ $CPLWAV = .T. ]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/mod_def.* .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
fi
6 changes: 3 additions & 3 deletions tests/fv3_conf/cpld_bmark_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .

# WW3 fix/input
if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
if [[ $RT35D == .T. ]]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/ww3_multi_35d.inp ww3_multi.inp
cp @[INPUTDATA_ROOT_WW3]/ww3_multi_35d.inp ww3_multi.inp
cp @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
else
cp @[INPUTDATA_ROOT]/WW3_input_data/ww3_multi.inp .
cp @[INPUTDATA_ROOT_WW3]/ww3_multi.inp .
fi
fi

Expand Down
4 changes: 2 additions & 2 deletions tests/fv3_conf/fv3_gocart.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat

if [ $CPLWAV = .T. ]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/mod_def.* .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
fi
6 changes: 3 additions & 3 deletions tests/fv3_conf/fv3_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cp @[INPUTDATA_ROOT]/${inputdir}/*_table .
cp @[INPUTDATA_ROOT]/${inputdir}/*configure .

if [ $CPLWAV = .T. ]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/mod_def.* .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
fi
4 changes: 2 additions & 2 deletions tests/fv3_conf/gfdlmp_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ cp @[INPUTDATA_ROOT]/FV3_input_data/field_table_gfdlmp field_table
cp @[INPUTDATA_ROOT]/FV3_input_data/*configure .

if [ $CPLWAV = .T. ]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/mod_def.* .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
fi
6 changes: 3 additions & 3 deletions tests/fv3_conf/multigases_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cp @[INPUTDATA_ROOT]/${inputdir}/diag_table_multi_gases diag_table
cp @[INPUTDATA_ROOT]/${inputdir}/field_table_multi_gases field_table

if [ $CPLWAV = .T. ]; then
cp @[INPUTDATA_ROOT]/WW3_input_data/mod_def.* .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
fi
5 changes: 4 additions & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
QUEUE=batch
COMPILE_QUEUE=batch

# ACCNR=fv3-cpu
#ACCNR=fv3-cpu
PARTITION=
dprefix=/scratch1/NCEPDEV
DISKNM=$dprefix/nems/emc.nemspara/RT
Expand Down Expand Up @@ -402,6 +402,7 @@ else
fi

INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20201201/}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20201201/}WW3_input_data_20201207/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should be:
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20201207/

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DeniseWorthen Done, thanks for the suggestion.


shift $((OPTIND-1))
[[ $# -gt 1 ]] && usage
Expand Down Expand Up @@ -476,6 +477,7 @@ if [[ $ROCOTO == true ]]; then
<!ENTITY PATHTR "${PATHTR}">
<!ENTITY RTPWD "${RTPWD}">
<!ENTITY INPUTDATA_ROOT "${INPUTDATA_ROOT}">
<!ENTITY INPUTDATA_ROOT_WW3 "${INPUTDATA_ROOT_WW3}">
<!ENTITY RUNDIR_ROOT "${RUNDIR_ROOT}">
<!ENTITY NEW_BASELINE "${NEW_BASELINE}">
]>
Expand Down Expand Up @@ -647,6 +649,7 @@ EOF
export RT_COMPILER=${RT_COMPILER}
export RTPWD=${RTPWD}
export INPUTDATA_ROOT=${INPUTDATA_ROOT}
export INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT_WW3}
export PATHRT=${PATHRT}
export PATHTR=${PATHTR}
export NEW_BASELINE=${NEW_BASELINE}
Expand Down