Skip to content

Iaudrymass coupledfield ww3 #56

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

Merged
DusanJovic-NOAA merged 16 commits into from
Feb 19, 2020
Merged

Iaudrymass coupledfield ww3 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
aeab6a6
update with new iau_drymassfixer option
junwang-noaa Feb 10, 2020
02260b0
fix syntax error in fv3
junwang-noaa Feb 10, 2020
42f35ee
update fv3_iau test case
junwang-noaa Feb 10, 2020
2996200
revert iau-drymassfixer change in fv3_gfdlmprad_32bit_post
junwang-noaa Feb 10, 2020
fffafa1
update ww3 with bug fix for OpenMp b4b
Feb 11, 2020
c83f43e
update fv3 with coupled model dump field changes
junwang-noaa Feb 11, 2020
e7f1a9e
update nemscompset run c768 fv3-ww3 to use threads
junwang-noaa Feb 13, 2020
1a8d268
update NEMS to the latest version
junwang-noaa Feb 14, 2020
26dbeaa
update RT baseline directory
junwang-noaa Feb 14, 2020
4b8f507
add dry mass fixer in iau nemscompset test
junwang-noaa Feb 14, 2020
8dc7900
fix iau syntax error in nemscompsets
junwang-noaa Feb 14, 2020
1c9651c
update post lib to 8.0.5
junwang-noaa Feb 14, 2020
33d6dbf
update fv3 link
junwang-noaa Feb 17, 2020
7ebb69d
update regression test log files on hera
junwang-noaa Feb 18, 2020
6e2f722
update regression test log files on cray and hera
junwang-noaa Feb 18, 2020
1e7a237
Update FV3 submodule
junwang-noaa Feb 18, 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 from b7a44c to 8683a6
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 6 files
+2 −2 src/incmake/component_CICE.mk
+6 −6 src/incmake/component_MOM6.mk
+1 −1 src/incmake/component_WW3.mk
+19 −0 src/module_EARTH_GRID_COMP.F90
+20 −18 src/module_MEDIATOR.F90
+6 −7 tests/apps.def
2 changes: 1 addition & 1 deletion WW3
Open in desktop
Submodule WW3 updated 8 files
+94 −43 model/aux/w3adc.f
+7 −9 model/ftn/w3iogomd.ftn
+2 −2 model/ftn/w3pro1md.ftn
+2 −2 model/ftn/w3pro3md.ftn
+4 −2 model/ftn/w3uno2md.ftn
+2 −0 model/ftn/w3uqckmd.ftn
+8 −8 model/ftn/w3wavemd.ftn
+1 −1 regtests/bin/matrix_ncep
14 changes: 8 additions & 6 deletions compsets/fv3.input
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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