From c80b5827a1be9c4b2db9f253d1cba392374dd476 Mon Sep 17 00:00:00 2001 From: Bin Li Date: Tue, 15 Oct 2024 12:17:43 -0500 Subject: [PATCH] Updated tests. --- tests/default_vars.sh | 4 ++++ tests/parm/input_nest_hafs.nml.IN | 1 + tests/parm/input_regional_hafs.nml.IN | 1 + tests/run_test.sh | 4 ++-- ...fs_regional_storm_following_1nest_atm_ocn_wav_2way-atm-wav | 3 ++- ...fs_regional_storm_following_1nest_atm_ocn_wav_2way-ocn-wav | 1 + 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index bac9b696af..e0f5834d8e 100644 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -730,6 +730,8 @@ export CPLWAV=.false. export CPLWAV2ATM=.false. export CPLLND=.false. export CPLLND2ATM=.false. +export CPLOCN2ATM=.false. +export ICPLOCN2ATM=0 export USE_MED_FLUX=.false. export DAYS=1 export NPX=97 @@ -1218,6 +1220,8 @@ export CPLICE=.true. export CPL=.true. export CPLWAV=.true. export CPLWAV2ATM=.true. +export CPLOCN2ATM=.false. +export ICPLOCN2ATM=0 export USE_MED_FLUX=.false. export CPLCHM=.true. export CPLLND=.false. diff --git a/tests/parm/input_nest_hafs.nml.IN b/tests/parm/input_nest_hafs.nml.IN index 3fa3d79f41..d570af10ce 100644 --- a/tests/parm/input_nest_hafs.nml.IN +++ b/tests/parm/input_nest_hafs.nml.IN @@ -203,6 +203,7 @@ cplflx = @[CPLFLX] cplice = .false. cplocn2atm = @[CPLOCN2ATM] + icplocn2atm = @[ICPLOCN2ATM] cplwav = @[CPLWAV] cplwav2atm = @[CPLWAV2ATM] cpl_imp_mrg = @[CPL_IMP_MRG] diff --git a/tests/parm/input_regional_hafs.nml.IN b/tests/parm/input_regional_hafs.nml.IN index 48da18134f..21c4fb992b 100644 --- a/tests/parm/input_regional_hafs.nml.IN +++ b/tests/parm/input_regional_hafs.nml.IN @@ -222,6 +222,7 @@ cplflx = @[CPLFLX] cplice = .false. cplocn2atm = @[CPLOCN2ATM] + icplocn2atm = @[ICPLOCN2ATM] cplwav = @[CPLWAV] cplwav2atm = @[CPLWAV2ATM] cpl_imp_mrg = @[CPL_IMP_MRG] diff --git a/tests/run_test.sh b/tests/run_test.sh index 347dd27827..53e1a288e4 100755 --- a/tests/run_test.sh +++ b/tests/run_test.sh @@ -266,8 +266,8 @@ if [[ ${CPLWAV} == .true. ]]; then if [[ ${WW3_MULTIGRID} = 'true' ]]; then atparse < "${PATHRT}/parm/ww3_multi.inp.IN" > ww3_multi.inp else - #atparse < "${PATHRT}/parm/ww3_shel.nml.IN" > ww3_shel.nml - atparse < "${PATHRT}/parm/ww3_shel.inp.IN" > ww3_shel.inp + atparse < "${PATHRT}/parm/ww3_shel.nml.IN" > ww3_shel.nml + #atparse < "${PATHRT}/parm/ww3_shel.inp.IN" > ww3_shel.inp cp "${PATHRT}/parm/ww3_points.list" . fi fi diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_2way-atm-wav b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_2way-atm-wav index 018874ab3b..bf38318d4f 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_2way-atm-wav +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_2way-atm-wav @@ -104,9 +104,10 @@ export FHLWR=1800 export NSTF_NAME=0,0,0,0,0 export CPLFLX=.true. export CPLOCN2ATM=.true. +export ICPLOCN2ATM=1 export CPLWAV=.true. export CPLWAV2ATM=.true. -export SFC_Z0_TYPE=-1 +export SFC_Z0_TYPE=6 # ww3 export WW3_MODDEF=mod_def.natl_6m_2way_ocn_wav diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_2way-ocn-wav b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_2way-ocn-wav index ea7e0eca2c..6ec4548952 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_2way-ocn-wav +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_2way-ocn-wav @@ -104,6 +104,7 @@ export FHLWR=1800 export NSTF_NAME=0,0,0,0,0 export CPLFLX=.true. export CPLOCN2ATM=.true. +export ICPLOCN2ATM=1 export CPLWAV=.true. export CPLWAV2ATM=.false.