Skip to content

Commit

Permalink
Iaudrymass coupledfield ww3 (NCAR#56)
Browse files Browse the repository at this point in the history
* update with new iau_drymassfixer option
* fix syntax error in fv3
* update fv3_iau test case
* revert iau-drymassfixer change in fv3_gfdlmprad_32bit_post
* update ww3 with bug fix for OpenMp b4b
* update fv3 with coupled model dump field changes
* update nemscompset run c768 fv3-ww3 to use threads
* update NEMS to the latest version
* update post lib to 8.0.5
  • Loading branch information
junwang-noaa authored Feb 19, 2020
1 parent 31821b0 commit 47c7f9b
Show file tree
Hide file tree
Showing 37 changed files with 10,749 additions and 10,231 deletions.
2 changes: 1 addition & 1 deletion FV3
14 changes: 8 additions & 6 deletions compsets/fv3.input
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ fv3_defaults = {
SKEB='-999.0'

IAU_INC_FILES="''"
IAU_DRYMASSFIXER='.false.'

CPLFLX='.F.'
CPLWAV='.F.'
Expand Down Expand Up @@ -1764,11 +1765,11 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {
TEST_DESCR="Compare c768 FV3-WW3 Gaussian grid nemsio output results with previous trunk version"
CNTL_NAME="fv3_wrtGauss_nemsio_c768"

TASKS='1470'
TASKS='640'
PPN="@[plat%C768_PPN]"
THRD="@[plat%C768_THRD]"
INPES='16'
JNPES='12'
INPES='8'
JNPES='8'
NPX='769'
NPY='769'
NPZ='64'
Expand All @@ -1780,7 +1781,7 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {
FHMAX='06'
WLCLK='30'
WRITE_GROUP='3'
WRTTASK_PER_GROUP='36'
WRTTASK_PER_GROUP='12'
FDIAG='0,1,2,3,4,5,6,7,8,9,10,11,12'
OUTPUT_GRID="'gaussian_grid'"
OUTPUT_FILE="'nemsio'"
Expand All @@ -1806,9 +1807,9 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {

nems_configure="blocked_atm_wav"
atm_model='fv3'
atm_petlist_bounds="0 1259"
atm_petlist_bounds="0 419"
wav_model='ww3'
wav_petlist_bounds="1260 1469"
wav_petlist_bounds="420 639"
coupling_interval_sec=1800.0 # 30min coupling, fv3 time step

# The build variable is the fv3_ww3.exe, which
Expand Down Expand Up @@ -2096,6 +2097,7 @@ test fv3_iau: fv3.exe {
FDIAG='3'
NSTF_NAME='2,0,1,0,5'
IAU_INC_FILES='fv3_increment.nc'
IAU_DRYMASSFIXER='.true.'

CNTL="@[plat%BASELINE]/@[CNTL_NAME]" # Control baseline area

Expand Down
6 changes: 3 additions & 3 deletions compsets/hera.input
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform hera.intel {
cores_per_node=40 # Number of cores per node on compute nodes
cpus_per_core=2
C768_PPN=10
C768_THRD=1
C768_THRD=4

# hera testing: using longer run time
DEFAULT_TEST_WALLTIME=3000
Expand All @@ -31,8 +31,8 @@ platform hera.intel {
# INPUTS is the input directory, which should contain fix and parm
# files, plus any restarts or other inputs.

BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200202"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200202"
BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
INPUTS="@[BASELINE]"

default_resources={
Expand Down
22 changes: 11 additions & 11 deletions compsets/wcoss.input
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ platform wcoss.phase2 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'
MACHINE_ID='wcoss.phase2'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200202"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200202"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"

default_resources={
TASKS=156
Expand Down Expand Up @@ -123,11 +123,11 @@ platform wcoss.phase1 {
cores_per_node=16
cpus_per_core=2
C768_PPN=6
C768_THRD=1
C768_THRD=4

MACHINE_ID='wcoss.phase1'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200202"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200202"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"

# WCOSS Phase 2 has been slow of late.
DEFAULT_TEST_WALLTIME=2700
Expand Down Expand Up @@ -203,7 +203,7 @@ platform wcoss_dell_p3 {
cores_per_node=28
cpus_per_core=2
C768_PPN=7
C768_THRD=1
C768_THRD=4

DEFAULT_TEST_WALLTIME=3000

Expand All @@ -213,8 +213,8 @@ platform wcoss_dell_p3 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'

BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200202/"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200202/"
BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210/"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210/"

default_resources={
TASKS=156
Expand Down Expand Up @@ -303,7 +303,7 @@ platform wcoss.cray {
cores_per_node=24
cpus_per_core=2
C768_PPN=6
C768_THRD=1
C768_THRD=4

MPI='lsf_cray_intel'
SHORT_TEST_QUEUE='&SHORTQ;'
Expand All @@ -314,8 +314,8 @@ platform wcoss.cray {
BUILD_WALLTIME="3600"
DEFAULT_TEST_WALLTIME=1800

BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200202"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200202"
BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"

execution_time_modules=[[[
module load alps
Expand Down
Loading

0 comments on commit 47c7f9b

Please sign in to comment.