add 2 way atm-wav test

ufs-community · junwang-noaa · Mar 6, 2020 · Feb 27, 2020 · Feb 27, 2020 · Mar 2, 2020
commit 0adb99bb52945a2fef4b142b4ef6d5bb0d9fc078
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
  path = FV3
- url = https://github.com/NOAA-EMC/fv3atm
- branch = develop
+ url = https://github.com/SMoorthi-emc/fv3atm
+ branch = SM_Jan102020
 [submodule "NEMS"]
  path = NEMS
  url = https://github.com/NOAA-EMC/NEMS

diff --git a/FV3 b/FV3
diff --git a/compsets/all.input b/compsets/all.input
@@ -8,6 +8,7 @@ run fv3_restart @ fv3, standard, baseline
 run fv3_read_inc @ fv3, standard, baseline
 run fv3_gfdlmp @ fv3, standard, baseline
 run fv3_gfdlmprad @ fv3, standard, baseline, ww3, plat==hera.intel,plat==wcoss_dell_p3,plat==wcoss.cray
+run fv3_gfdlmprad_atmwav @ fv3, standard, baseline, ww3, plat==hera.intel,plat==wcoss_dell_p3,plat==wcoss.cray
 run fv3_gfdlmprad_gwd @ fv3, standard, baseline
 run fv3_gfdlmprad_noahmp @ fv3, standard, baseline
 run fv3_thompson @ fv3, standard, baseline

diff --git a/compsets/fv3.input b/compsets/fv3.input
@@ -268,6 +268,7 @@ fv3_defaults = {
 
  CPLFLX='.F.'
  CPLWAV='.F.'
+ CPLWAV2ATM='.F.'
  CPL='.false.'
 }
 
@@ -1224,6 +1225,35 @@ test fv3_gfdlmprad: fv3_ww3.exe {
 
 }
 
+test fv3_gfdlmprad_atmwav: fv3_ww3.exe {
+ use fv3_gfdlmprad
+
+ TEST_DESCR="Compare FV3 GFDL mircrophysics radiation change with 2 way WW3 results with previous trunk version"
+ CNTL_NAME='fv3_gfdlmprad_atmwav'
+
+ CPLWAV2ATM='.true.'
+ coupling_interval_sec=1200.0 #coupling time step, want it to be multiple of 1800 and FV3 time step
+
+ filters input {
+ 'input.nml' <=atparse= "@[PARMnems]/gfdlmp.nml.IN"
+ 'model_configure' <=atparse= "@[PARMnems]/model_configure.IN"
+ 'aerosol.dat' <=copyfrom= "@[FV3_input_data]/INPUT"
+ 'co2historicaldata_201*.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
+ 'sfc_emissivity_idx.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
+ 'solarconstant_noaa_an.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
+ '*grb' <=copyfrom= "@[FV3_input_data]"
+ '*_table' <=copyfrom= "@[FV3_input_data]"
+ 'diag_table' <=copy= "@[FV3_input_data]/diag_table_gfdlmp"
+ 'field_table' <=copy= "@[FV3_input_data]/field_table_gfdlmp"
+ 'INPUT' <=copy= "@[FV3_input_data]/INPUT"
+ 'global_o3prdlos.f77' <=copy= "@[FV3_input_data]/INPUT/global_o3prdlos.f77"
+ 'model_configure' <=atparse= "@[PARMnems]/model_configure.IN"
+ 'nems.configure' <=atparse= "@[PARMnems]/nems.configure.blocked_atm_wav_2way.IN"
+ 'mod_def.*' <=copyfrom= "@[WW3_input_data]"
+ 'ww3_multi.inp' <=copyfrom= "@[WW3_input_data]/@[SYEAR]@[SMONTH]@[SDAY]"
+ }
+
+}
 test fv3_gfdlmprad_gwd: fv3.exe {
  use fv3_gfdlmp
 

diff --git a/parm/ccpp_control.nml.IN b/parm/ccpp_control.nml.IN
@@ -184,6 +184,7 @@
  nstf_name = @[NSTF_NAME]
  cplflx = @[CPLFLX]
  cplwav = @[CPLWAV]
+ cplwav2atm = @[CPLWAV2ATM]
  iau_delthrs = 6
  iaufhrs = 30
  iau_inc_files = @[IAU_INC_FILES]

diff --git a/parm/ccpp_gfdlmp.nml.IN b/parm/ccpp_gfdlmp.nml.IN
@@ -180,6 +180,7 @@
  nstf_name = @[NSTF_NAME]
  cplflx = @[CPLFLX]
  cplwav = @[CPLWAV]
+ cplwav2atm = @[CPLWAV2ATM]
  xkzminv = 0.3
  xkzm_m = 1.0
  xkzm_h = 1.0

diff --git a/parm/gfdlmp.nml.IN b/parm/gfdlmp.nml.IN
@@ -174,6 +174,7 @@
  iau_drymassfixer = @[IAU_DRYMASSFIXER]
  cplflx = @[CPLFLX]
  cplwav = @[CPLWAV]
+ cplwav2atm = @[CPLWAV2ATM]
  xkzminv = 0.3
  xkzm_m = 1.0
  xkzm_h = 1.0

diff --git a/parm/input.nml.IN b/parm/input.nml.IN
@@ -181,6 +181,7 @@
  nstf_name = @[NSTF_NAME]
  cplflx = @[CPLFLX]
  cplwav = @[CPLWAV]
+ cplwav2atm = @[CPLWAV2ATM]
  iau_delthrs = 6
  iaufhrs = 30
  iau_inc_files = @[IAU_INC_FILES]

diff --git a/parm/nems.configure.blocked_atm_wav_2way.IN b/parm/nems.configure.blocked_atm_wav_2way.IN
@@ -0,0 +1,36 @@
+#############################################
+#### NEMS Run-Time Configuration File #####
+#############################################
+
+# EARTH #
+EARTH_component_list: ATM WAV
+EARTH_attributes::
+ Verbosity = 0
+::
+
+# ATM #
+ATM_model: @[atm_model]
+ATM_petlist_bounds: @[atm_petlist_bounds]
+ATM_attributes::
+ Verbosity = 0
+ DumpFields = false
+::
+
+# WAV #
+WAV_model: @[wav_model]
+WAV_petlist_bounds: @[wav_petlist_bounds]
+WAV_attributes::
+ Verbosity = 0
+::
+
+
+
+# Run Sequence #
+runSeq::
+ @@[coupling_interval_sec]
+ ATM -> WAV 
+ WAV -> ATM :srcMaskValues=1
+ ATM
+ WAV
+ @
+::
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -162,6 +162,7 @@ export H2O_PHYS=.F.
 export CPL=.F.
 export CPLFLX=.F.
 export CPLWAV=.F.
+export CPLWAV2ATM=.F.
 export DAYS=1
 export NPX=97
 export NPY=97

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -38,6 +38,9 @@ COMPILE | WW3=Y
 RUN | fv3_gfdlmprad | standard | wcoss_cray | fv3 |
 RUN | fv3_gfdlmprad | standard | wcoss_dell_p3 | fv3 |
 RUN | fv3_gfdlmprad | standard | hera.intel | fv3 |
+RUN | fv3_gfdlmprad_atmwav | standard | wcoss_cray | fv3 |
+RUN | fv3_gfdlmprad_atmwav | standard | wcoss_dell_p3 | fv3 |
+RUN | fv3_gfdlmprad_atmwav | standard | hera.intel | fv3 |
 RUN | fv3_wrtGauss_nemsio_c768 | standard | hera.intel | fv3 |
 ###RUN | fv3_wrtGauss_nemsio_c768 | standard | wcoss_cray | fv3 |
 ###RUN | fv3_wrtGauss_nemsio_c768 | standard | wcoss_dell_p3 | fv3 |

diff --git a/tests/tests/fv3_gfdlmprad_atmwav b/tests/tests/fv3_gfdlmprad_atmwav
@@ -0,0 +1,83 @@
+###############################################################################
+#
+# FV3 GFDL-MPrad 2way atm-way coupling test
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 GFDL-MP radiation interaction 2way atm-way coupling option with the control"
+
+export CNTL_DIR=fv3_gfdlmprad_atmwav
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+ atmos_4xdaily.tile2.nc \
+ atmos_4xdaily.tile3.nc \
+ atmos_4xdaily.tile4.nc \
+ atmos_4xdaily.tile5.nc \
+ atmos_4xdaily.tile6.nc \
+ phyf000.nemsio \
+ phyf024.nemsio \
+ dynf000.nemsio \
+ dynf024.nemsio \
+ RESTART/coupler.res \
+ RESTART/fv_core.res.nc \
+ RESTART/fv_core.res.tile1.nc \
+ RESTART/fv_core.res.tile2.nc \
+ RESTART/fv_core.res.tile3.nc \
+ RESTART/fv_core.res.tile4.nc \
+ RESTART/fv_core.res.tile5.nc \
+ RESTART/fv_core.res.tile6.nc \
+ RESTART/fv_srf_wnd.res.tile1.nc \
+ RESTART/fv_srf_wnd.res.tile2.nc \
+ RESTART/fv_srf_wnd.res.tile3.nc \
+ RESTART/fv_srf_wnd.res.tile4.nc \
+ RESTART/fv_srf_wnd.res.tile5.nc \
+ RESTART/fv_srf_wnd.res.tile6.nc \
+ RESTART/fv_tracer.res.tile1.nc \
+ RESTART/fv_tracer.res.tile2.nc \
+ RESTART/fv_tracer.res.tile3.nc \
+ RESTART/fv_tracer.res.tile4.nc \
+ RESTART/fv_tracer.res.tile5.nc \
+ RESTART/fv_tracer.res.tile6.nc \
+ RESTART/sfc_data.tile1.nc \
+ RESTART/sfc_data.tile2.nc \
+ RESTART/sfc_data.tile3.nc \
+ RESTART/sfc_data.tile4.nc \
+ RESTART/sfc_data.tile5.nc \
+ RESTART/sfc_data.tile6.nc \
+ RESTART/phy_data.tile1.nc \
+ RESTART/phy_data.tile2.nc \
+ RESTART/phy_data.tile3.nc \
+ RESTART/phy_data.tile4.nc \
+ RESTART/phy_data.tile5.nc \
+ RESTART/phy_data.tile6.nc \
+ out_grd.glo_30m"
+
+
+export_fv3
+
+export TASKS=264
+export NODES=$(expr $TASKS / $TPN + 1)
+
+DT_ATMOS="1200"
+export LGFDLMPRAD=.true.
+export EFFR_IN=.true.
+
+export OUTPUT_GRID="'gaussian_grid'"
+export OUTPUT_FILE="'nemsio'"
+export WRITE_NEMSIOFLIP=.true.
+export WRITE_FSYNCFLAG=.true.
+
+export CPL=.true.
+export CPLWAV=.T.
+export CPLWAV2ATM=.T.
+export atm_model='fv3'
+export atm_petlist_bounds="0 149"
+export wav_model='ww3'
+export wav_petlist_bounds="150 263"
+export coupling_interval_sec=3600.0 #coupling time step, want it to be multiple of 1800 and FV3 time step
+export NEMS_CONFIGURE="nems.configure.blocked_atm_wav_2way.IN"
+
+export INPUT_NML=gfdlmp.nml.IN
+export FV3_RUN=gfdlmp_run.IN
+
+RUN_SCRIPT=rt_fv3.sh