Skip to content

Commit

Permalink
wave-ocean coupling (#91)
Browse files Browse the repository at this point in the history 
* Add wave->ocean coupling. 

* Wave coupling is two-way with the atmosphere, two-way with the ocean and one way (ice concentration -> waves) with ice.

* The wave regression test is updated to include wave coupling with both atm and ocean.

* A script and needed inputs are added to the baseline area to create a new mod_def file for WW3 if required
  • Loading branch information
@JessicaMeixner-NOAA
JessicaMeixner-NOAA authored May 18, 2020
1 parent 5b9d774 commit b116b71
Show file tree
Hide file tree
Showing 70 changed files with 19,851 additions and 18,586 deletions.
1 change: 1 addition & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/noaa-psd/stochastic_physics
branch = master
[submodule "MOM6"]
path = MOM6
url = https://github.com/NOAA-EMC/MOM6-interface
Expand Down
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 10 files
+27 −14 atmos_model.F90
+1 −1 ccpp/physics
+2 −2 gfsphysics/GFS_layer/GFS_diagnostics.F90
+89 −39 gfsphysics/GFS_layer/GFS_driver.F90
+16 −42 gfsphysics/GFS_layer/GFS_physics_driver.F90
+91 −53 gfsphysics/GFS_layer/GFS_typedefs.F90
+35 −37 gfsphysics/GFS_layer/GFS_typedefs.meta
+1 −6 gfsphysics/physics/GFS_debug.F90
+88 −17 gfsphysics/physics/samfdeepcnv.f
+3 −2 stochastic_physics/CMakeLists.txt
2 changes: 1 addition & 1 deletion MOM6
Submodule MOM6 updated 2 files
+2 −0 .gitmodules
+1 −1 src/MOM6
2 changes: 1 addition & 1 deletion WW3
Submodule WW3 updated 65 files
+45 −43 manual/eqs/IS2.tex
+1 −1 model/bin/cmplr.env
+1 −1 model/bin/comp.wcoss_phase2
+1 −1 model/bin/link.wcoss_phase2
+8 −5 model/bin/ww3_from_ftp.sh
+1 −0 model/esmf/switch
+4 −4 model/ftn/gx_outp.ftn
+16 −12 model/ftn/w3gdatmd.ftn
+2 −1 model/ftn/w3iobcmd.ftn
+18 −10 model/ftn/w3iogomd.ftn
+6 −6 model/ftn/w3iogrmd.ftn
+13 −17 model/ftn/w3sis2md.ftn
+312 −292 model/ftn/w3src4md.ftn
+6 −9 model/ftn/w3srcemd.ftn
+5 −1 model/ftn/w3triamd.ftn
+316 −24 model/ftn/wmesmfmd.ftn
+64 −107 model/ftn/ww3_bounc.ftn
+98 −59 model/ftn/ww3_grid.ftn
+17 −15 model/ftn/ww3_ounp.ftn
+6 −6 model/ftn/ww3_outp.ftn
+1 −0 regtests/bin/matrix.base
+31 −25 regtests/bin/matrix_datarmor
+13 −2 regtests/bin/run_test
+1 −1 regtests/mww3_test_07/input/namelists_refug.nml
+1 −1 regtests/mww3_test_07/input/ww3_grid_refug.inp
+1 −1 regtests/ww3_tic1.4/input/ww3_ounf.inp
+1 −1 regtests/ww3_tic1.4/input/ww3_ounf.nml
+7 −7 regtests/ww3_tic1.4/input/ww3_shel.inp
+14 −10 regtests/ww3_tic1.4/input/ww3_shel.nml
+2 −2 regtests/ww3_tic1.4/input/ww3_strt.inp
+1 −1 regtests/ww3_tic2.1/info
+2 −2 regtests/ww3_tp1.10/info
+32 −0 regtests/ww3_tp1.11/info
+1 −0 regtests/ww3_tp1.11/input/1-D.depth
+3 −0 regtests/ww3_tp1.11/input/namelists_1-D.nml
+6 −0 regtests/ww3_tp1.11/input/points.list
+1 −0 regtests/ww3_tp1.11/input/spec.list
+1 −0 regtests/ww3_tp1.11/input/switch
+4,372 −0 regtests/ww3_tp1.11/input/ww3.Point0_196806_spec.cdl
+22 −0 regtests/ww3_tp1.11/input/ww3_bounc.nml
+267 −0 regtests/ww3_tp1.11/input/ww3_grid.nml
+58 −0 regtests/ww3_tp1.11/input/ww3_ounf.nml
+133 −0 regtests/ww3_tp1.11/input/ww3_ounp.nml
+108 −0 regtests/ww3_tp1.11/input/ww3_shel.nml
+5 −0 regtests/ww3_tp1.11/input/ww3_strt.inp
+1 −1 regtests/ww3_tp1.8/input/namelists_VALIDATION.nml
+1 −1 regtests/ww3_tp1.8/input/ww3_grid.inp
+1 −1 regtests/ww3_tp2.15/input/namelists_5km.nml
+1 −1 regtests/ww3_tp2.15/input/namelists_ADRIATIC.nml
+1 −1 regtests/ww3_tp2.15/input/ww3_grid.inp
+1 −1 regtests/ww3_tp2.15/input/ww3_grid_5km.inp
+3 −3 regtests/ww3_tp2.17/input/namelists_a.nml
+3 −3 regtests/ww3_tp2.17/input/namelists_b.nml
+3 −3 regtests/ww3_tp2.17/input/namelists_c.nml
+3 −3 regtests/ww3_tp2.17/input/namelists_inla.nml
+3 −3 regtests/ww3_tp2.17/input/namelists_inlb.nml
+3 −3 regtests/ww3_tp2.17/input/namelists_inlc.nml
+3 −3 regtests/ww3_tp2.17/input/ww3_grid_a.inp
+3 −3 regtests/ww3_tp2.17/input/ww3_grid_b.inp
+3 −3 regtests/ww3_tp2.17/input/ww3_grid_c.inp
+3 −3 regtests/ww3_tp2.17/input/ww3_grid_inla.inp
+3 −3 regtests/ww3_tp2.17/input/ww3_grid_inlb.inp
+3 −3 regtests/ww3_tp2.17/input/ww3_grid_inlc.inp
+1 −1 regtests/ww3_tp2.5/input_REF/ww3_ounp.inp
+0 −1 regtests/ww3_tp2.5/input_REF/ww3_ounp.nml
5 changes: 3 additions & 2 deletions compsets/benchmarkWAV_ccpp_cold.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ test cpld_fv3_ccpp_384_mom6_cice_ww3_cold_bmark_rt: fv3_ccpp_mom6_cice_ww3.exe {
FIELD_TABLE="field_table.gfdlmp"
OZONE_data="@[FV3_input_data]/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77"
CO2_data="@[plat%INPUTS]/FV3_input_bm2/INPUT"
WW3_input_data="@[plat%INPUTS]/WW3_input_data"

# - set date YYYYMMDDHH
SYEAR='2013'
Expand Down Expand Up @@ -85,7 +86,7 @@ WW3_input_data="@[plat%INPUTS]/WW3_input_data"
'kmtu_cice_NEMS_mx025.nc' <=copy= "@[UGCS_input_data]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx025.nc"
#WW3 fix/input
'mod_def.*' <=copyfrom= "@[WW3_input_data]"
'ww3_multi.inp' <=copyfrom= "@[WW3_input_data]/@[SYEAR]@[SMONTH]@[SDAY]"
'ww3_multi.inp' <=copyfrom= "@[WW3_input_data]"
# ICs
'INPUT/sfc_data*.nc' <=copyfrom= "@[FV3_IC]"
'INPUT/gfs_data*.nc' <=copyfrom= "@[FV3_IC]"
Expand All @@ -95,7 +96,7 @@ WW3_input_data="@[plat%INPUTS]/WW3_input_data"
'input.nml' <=atparse= "@[PARMnems]/@[INPUT_NML]"
'model_configure' <=atparse= "@[PARMnems]/model_configure.IN"
'ice_in_template' <=copy= "@[PARMnems]/ice_in_template"
'INPUT/MOM_input_template' <=copy= "@[PARMnems]/MOM_input_template"
'INPUT/MOM_input_template' <=copy= "@[PARMnems]/MOM_input_wave_template"
'diag_table_template' <=copy= "@[PARMnems]/diag_table_template"
'data_table' <=copy= "@[PARMnems]/data_table"
"nems.configure" <=atparse= "@[PARMnems]/nems.configure.@[nems_configure].IN"
Expand Down
10 changes: 5 additions & 5 deletions compsets/benchmarkWAV_ccpp_warm.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ test cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt: fv3_ccpp_mom6_cice_ww3.exe {
FIELD_TABLE="field_table.gfdlmp"
OZONE_data="@[FV3_input_data]/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77"
CO2_data="@[plat%INPUTS]/FV3_input_bm2/INPUT"
WW3_input_data="@[plat%INPUTS]/WW3_input_data"

# - set date YYYYMMDDHH
SYEAR='2013'
Expand All @@ -53,7 +54,6 @@ test cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt: fv3_ccpp_mom6_cice_ww3.exe {
FV3_IC="@[BM_IC]/gfs/C384/INPUT"
MOM6_IC="@[BM_IC]/mom6_da"
CICE5_IC="@[BM_IC]/cpc"
WW3_input_data="@[plat%INPUTS]/WW3_input_data"

# set location of cold start for mediator restarts
MED_restart_data="@[plat%INPUTS]/MEDIATOR_bmwav_ccpp"
Expand Down Expand Up @@ -94,7 +94,7 @@ WW3_input_data="@[plat%INPUTS]/WW3_input_data"
'kmtu_cice_NEMS_mx025.nc' <=copy= "@[UGCS_input_data]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx025.nc"
#WW3 fix/input
'mod_def.*' <=copyfrom= "@[WW3_input_data]"
'ww3_multi.inp' <=copyfrom= "@[WW3_input_data]/@[SYEAR]@[SMONTH]@[SDAY]"
'ww3_multi.inp' <=copyfrom= "@[WW3_input_data]"
# ICs
'INPUT/sfc_data*.nc' <=copyfrom= "@[FV3_IC]"
'INPUT/gfs_data*.nc' <=copyfrom= "@[FV3_IC]"
Expand All @@ -105,7 +105,7 @@ WW3_input_data="@[plat%INPUTS]/WW3_input_data"
'input.nml' <=atparse= "@[PARMnems]/@[INPUT_NML]"
'model_configure' <=atparse= "@[PARMnems]/model_configure.IN"
'ice_in_template' <=copy= "@[PARMnems]/ice_in_template"
'INPUT/MOM_input_template' <=copy= "@[PARMnems]/MOM_input_template"
'INPUT/MOM_input_template' <=copy= "@[PARMnems]/MOM_input_wave_template"
'diag_table_template' <=copy= "@[PARMnems]/diag_table_template"
'data_table' <=copy= "@[PARMnems]/data_table"
"nems.configure" <=atparse= "@[PARMnems]/nems.configure.@[nems_configure].IN"
Expand All @@ -128,9 +128,9 @@ WW3_input_data="@[plat%INPUTS]/WW3_input_data"
'dynf024.tile4.nc' .bitcmp. "@[CNTL]"
'dynf024.tile5.nc' .bitcmp. "@[CNTL]"
'dynf024.tile6.nc' .bitcmp. "@[CNTL]"
'20130402.000000.out_grd.glo_30m' .bitcmp. "@[CNTL]"
'20130402.000000.out_grd.gwes_30m' .bitcmp. "@[CNTL]"
'20130402.000000.out_pnt.points' .bitcmp. "@[CNTL]"
'20130402.000000.restart.glo_30m' .bitcmp. "@[CNTL]/RESTART"
'20130402.000000.restart.gwes_30m' .bitcmp. "@[CNTL]/RESTART"
'RESTART/coupler.res' .bitcmp. "@[CNTL]/RESTART"
'RESTART/fv_core.res.nc' .bitcmp. "@[CNTL]/RESTART"
'RESTART/fv_core.res.tile1.nc' .bitcmp. "@[CNTL]/RESTART"
Expand Down
7 changes: 4 additions & 3 deletions compsets/benchmark_cold_ccpp.input
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
########################################################################

test cpld_fv3_ccpp_384_mom6_cice_cold_bmark: fv3_ccpp_mom6_cice.exe {
use cpld_fv3_ccpp_mom6_cice_cold_atm_flux
use plat%default_cpl_benchmark
test cpld_fv3_ccpp_384_mom6_cice_cold_bmark: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_ww3_cold_bmark_rt
use plat%default_cpl_wwav

ATMRES='384'
TEST_DESCR="Fully coupled FV3-MOM6-CICE system - cold 384"
Expand All @@ -26,6 +26,7 @@ test cpld_fv3_ccpp_384_mom6_cice_cold_bmark: fv3_ccpp_mom6_cice.exe {
FIELD_TABLE="field_table.gfdlmp"
OZONE_data="@[FV3_input_data]/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77"
CO2_data="@[plat%INPUTS]/FV3_input_bm2/INPUT"
WW3_input_data="@[plat%INPUTS]/WW3_input_data"

# - set date YYYYMMDDHH
SYEAR='2012'
Expand Down
9 changes: 5 additions & 4 deletions compsets/benchmark_warm_ccpp.input
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
########################################################################

test cpld_fv3_ccpp_384_mom6_cice_2d_bmark: fv3_ccpp_mom6_cice.exe {
use cpld_fv3_ccpp_mom6_cice_2d_atm_flux
use plat%default_cpl_benchmark
test cpld_fv3_ccpp_384_mom6_cice_2d_bmark: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt
use plat%default_cpl_wwav

ATMRES='384'
TEST_DESCR="Fully coupled FV3-MOM6-CICE system - benchmark"
TEST_DESCR="Fully coupled FV3-MOM6-CICE-WW3 system - benchmark"

#For a 35 day run:
#DAYS='35'
Expand Down Expand Up @@ -41,6 +41,7 @@ test cpld_fv3_ccpp_384_mom6_cice_2d_bmark: fv3_ccpp_mom6_cice.exe {
FIELD_TABLE="field_table.gfdlmp"
OZONE_data="@[FV3_input_data]/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77"
CO2_data="@[plat%INPUTS]/FV3_input_bm2/INPUT"
WW3_input_data="@[plat%INPUTS]/WW3_input_data"

# - set date YYYYMMDDHH
SYEAR='2012'
Expand Down
16 changes: 8 additions & 8 deletions compsets/datesuite_cold_ccpp.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
load 'benchmark_cold_ccpp.input'

########################################################################
test cpld_fv3_ccpp_384_mom6_cice_cold_2012010100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_cold_2012010100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_cold_bmark

# - set date YYYYMMDDHH
Expand All @@ -13,7 +13,7 @@ test cpld_fv3_ccpp_384_mom6_cice_cold_2012010100: fv3_ccpp_mom6_cice.exe {
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"
}

test cpld_fv3_ccpp_384_mom6_cice_cold_2012040100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_cold_2012040100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_cold_bmark

# - set date YYYYMMDDHH
Expand All @@ -24,7 +24,7 @@ test cpld_fv3_ccpp_384_mom6_cice_cold_2012040100: fv3_ccpp_mom6_cice.exe {
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"
}

test cpld_fv3_ccpp_384_mom6_cice_cold_2012070100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_cold_2012070100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_cold_bmark

# - set date YYYYMMDDHH
Expand All @@ -35,7 +35,7 @@ test cpld_fv3_ccpp_384_mom6_cice_cold_2012070100: fv3_ccpp_mom6_cice.exe {
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"
}

test cpld_fv3_ccpp_384_mom6_cice_cold_2012100100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_cold_2012100100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_cold_bmark

# - set date YYYYMMDDHH
Expand All @@ -46,7 +46,7 @@ test cpld_fv3_ccpp_384_mom6_cice_cold_2012100100: fv3_ccpp_mom6_cice.exe {
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"
}

test cpld_fv3_ccpp_384_mom6_cice_cold_2013010100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_cold_2013010100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_cold_bmark

# - set date YYYYMMDDHH
Expand All @@ -57,7 +57,7 @@ test cpld_fv3_ccpp_384_mom6_cice_cold_2013010100: fv3_ccpp_mom6_cice.exe {
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"
}

test cpld_fv3_ccpp_384_mom6_cice_cold_2013040100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_cold_2013040100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_cold_bmark

# - set date YYYYMMDDHH
Expand All @@ -68,7 +68,7 @@ test cpld_fv3_ccpp_384_mom6_cice_cold_2013040100: fv3_ccpp_mom6_cice.exe {
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"
}

test cpld_fv3_ccpp_384_mom6_cice_cold_2013070100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_cold_2013070100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_cold_bmark

# - set date YYYYMMDDHH
Expand All @@ -79,7 +79,7 @@ test cpld_fv3_ccpp_384_mom6_cice_cold_2013070100: fv3_ccpp_mom6_cice.exe {
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"
}

test cpld_fv3_ccpp_384_mom6_cice_cold_2013100100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_cold_2013100100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_cold_bmark

# - set date YYYYMMDDHH
Expand Down
20 changes: 10 additions & 10 deletions compsets/datesuite_warm_ccpp.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ load 'benchmark_warm_ccpp.input'
ROOTDIR = "path-to-user-coldstarts"

datesuite_defaults = {
DAYS='5'
DAYS='5'
FHMAX='120'
walltime=10800 # seconds
#DAYS='35'
#DAYS='35'
#FHMAX='840'
#walltime=28800 # seconds
}

########################################################################
test cpld_fv3_ccpp_384_mom6_cice_5d_2012010100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_5d_2012010100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_2d_bmark
use datesuite_defaults

Expand All @@ -30,7 +30,7 @@ test cpld_fv3_ccpp_384_mom6_cice_5d_2012010100: fv3_ccpp_mom6_cice.exe {
MED_restart_data="@[ROOTDIR]/tmp/cpld_fv3_ccpp_384_mom6_cice_cold_2012010100"
}

test cpld_fv3_ccpp_384_mom6_cice_5d_2012040100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_5d_2012040100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_2d_bmark
use datesuite_defaults

Expand All @@ -44,7 +44,7 @@ test cpld_fv3_ccpp_384_mom6_cice_5d_2012040100: fv3_ccpp_mom6_cice.exe {
MED_restart_data="@[ROOTDIR]/tmp/cpld_fv3_ccpp_384_mom6_cice_cold_2012040100"
}

test cpld_fv3_ccpp_384_mom6_cice_5d_2012070100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_5d_2012070100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_2d_bmark
use datesuite_defaults

Expand All @@ -58,7 +58,7 @@ test cpld_fv3_ccpp_384_mom6_cice_5d_2012070100: fv3_ccpp_mom6_cice.exe {
MED_restart_data="@[ROOTDIR]/tmp/cpld_fv3_ccpp_384_mom6_cice_cold_2012070100"
}

test cpld_fv3_ccpp_384_mom6_cice_5d_2012100100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_5d_2012100100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_2d_bmark
use datesuite_defaults

Expand All @@ -72,7 +72,7 @@ test cpld_fv3_ccpp_384_mom6_cice_5d_2012100100: fv3_ccpp_mom6_cice.exe {
MED_restart_data="@[ROOTDIR]/tmp/cpld_fv3_ccpp_384_mom6_cice_cold_2012100100"
}

test cpld_fv3_ccpp_384_mom6_cice_5d_2013010100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_5d_2013010100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_2d_bmark
use datesuite_defaults

Expand All @@ -85,7 +85,7 @@ test cpld_fv3_ccpp_384_mom6_cice_5d_2013010100: fv3_ccpp_mom6_cice.exe {
MED_restart_data="@[ROOTDIR]/tmp/cpld_fv3_ccpp_384_mom6_cice_cold_2013010100"
}

test cpld_fv3_ccpp_384_mom6_cice_5d_2013040100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_5d_2013040100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_2d_bmark
use datesuite_defaults

Expand All @@ -98,7 +98,7 @@ test cpld_fv3_ccpp_384_mom6_cice_5d_2013040100: fv3_ccpp_mom6_cice.exe {
MED_restart_data="@[ROOTDIR]/tmp/cpld_fv3_ccpp_384_mom6_cice_cold_2013040100"
}

test cpld_fv3_ccpp_384_mom6_cice_5d_2013070100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_5d_2013070100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_2d_bmark
use datesuite_defaults

Expand All @@ -111,7 +111,7 @@ test cpld_fv3_ccpp_384_mom6_cice_5d_2013070100: fv3_ccpp_mom6_cice.exe {
MED_restart_data="@[ROOTDIR]/tmp/cpld_fv3_ccpp_384_mom6_cice_cold_2013070100"
}

test cpld_fv3_ccpp_384_mom6_cice_5d_2013100100: fv3_ccpp_mom6_cice.exe {
test cpld_fv3_ccpp_384_mom6_cice_5d_2013100100: fv3_ccpp_mom6_cice_ww3.exe {
use cpld_fv3_ccpp_384_mom6_cice_2d_bmark
use datesuite_defaults

Expand Down
24 changes: 22 additions & 2 deletions compsets/fv3.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ build fv3.exe {
}

build fv3_ccpp_control.exe {
# This block builds the FV3 with CCPP in static mode for the control setup.
# This block builds the FV3 with CCPP for the control setup.
# It is otherwise identical to the fv3.exe block.
use plat

Expand All @@ -106,7 +106,7 @@ build fv3_ccpp_control.exe {
# build: script to build the NEMS.x. For now, this is an embedded
# bash script.
build=compile.sh(fv3="@[target]",modules="@[modules.nems]",md5="@[md5sum]",
MAKE_OPTS="\'CCPP=Y STATIC=Y SUITES=FV3_GFS_2017\'")
MAKE_OPTS="\'CCPP=Y SUITES=FV3_GFS_2017\'")
}

build fv3_32bit.exe {
Expand Down Expand Up @@ -266,6 +266,10 @@ fv3_defaults = {
IAU_INC_FILES="''"
IAU_DRYMASSFIXER='.false.'

DO_CA='.F.'
CA_SGS='.F.'
CA_GLOBAL='.F.'

CPLFLX='.F.'
CPLWAV='.F.'
CPLWAV2ATM='.F.'
Expand Down Expand Up @@ -1422,6 +1426,19 @@ test fv3_wrtGauss_netcdf: fv3.exe {
}
}

test fv3_wrtGlatlon_netcdf: fv3.exe {
use fv3_wrtGauss_netcdf

TEST_DESCR="Compare FV3 global latlon grid netcdf output results with previous trunk version"
CNTL_NAME="fv3_wrtGlatlon_netcdf"

OUTPUT_GRID="'global_latlon'"

COM="@[plat%COMrt]/@[TEST_NAME]" # Test result area
RUNDIR="@[plat%TMPrt]/@[TEST_NAME]" # Test work area
CNTL="@[plat%BASELINE]/@[CNTL_NAME]" # Control baseline area
}

########################################################################

test fv3_satmedmf: fv3.exe {
Expand All @@ -1432,6 +1449,7 @@ test fv3_satmedmf: fv3.exe {

SATMEDMF='.true.'
HYBEDMF='.false.'
DT_ATMOS=1200
OUTPUT_GRID="'gaussian_grid'"
OUTPUT_FILE="'nemsio'"
WRITE_NEMSIOFLIP='.true.'
Expand Down Expand Up @@ -3211,6 +3229,7 @@ test fv3_csawmg: fv3.exe {
RUNDIR="@[plat%TMPrt]/@[TEST_NAME]" # Test work area
CNTL="@[plat%BASELINE]/@[CNTL_NAME]" # Control baseline area
FV3_input_data="@[plat%INPUTS]/FV3_input_data"
FV3_input_iccn="@[plat%INPUTS]/FV3_input_data_INCCN_aeroclim"

# The build variable is the fv3.exe or fv3_appbuild.fv3, which
# provides the path to the build target, md5 sum, and modulefile.
Expand All @@ -3227,6 +3246,7 @@ test fv3_csawmg: fv3.exe {
'model_configure' <=atparse= "@[PARMnems]/model_configure.IN"
'aerosol.dat' <=copyfrom= "@[FV3_input_data]/INPUT"
'co2historicaldata_201*.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'cam5*.nc' <=copyfrom= "@[FV3_input_iccn]/mg2_IN_CCN"
'sfc_emissivity_idx.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'solarconstant_noaa_an.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'*grb' <=copyfrom= "@[FV3_input_data]"
Expand Down
8 changes: 8 additions & 0 deletions compsets/fv3mom6cice5_ccpp.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ cpl_defaults = {
ATMRES=''
OCNRES='025'
SUITE_NAME='FV3_GFS_2017_coupled'
OZ_PHYS_OLD='.T.'
OZ_PHYS_NEW='.F.'
DO_RRTMGP='.F.'

INPUT_NML='input.mom6_ccpp.nml.IN'
FIELD_TABLE="field_table"
NSOUT='-1'
Expand All @@ -121,6 +125,8 @@ cpl_defaults = {
DT_ATMOS='900' #needed for C96 cases
DT_DYNAM_MOM6='900'
DT_THERM_MOM6='1800'
mom6_restart_option='nhours'
mom6_restart_n='24'
# defaults for CICE runtype and restart writing
RUNTYPE='initial'
DUMPFREQ='d'
Expand Down Expand Up @@ -466,6 +472,8 @@ test cpld_fv3_ccpp_mom6_cice_6h_debug: fv3_ccpp_mom6_cice_debug.exe {
CNTL_NAME="RT-Baselines_6h_warm_debug_ccpp"
CNTL="@[plat%BASELINE]/@[CNTL_NAME]"

mom6_restart_n='6'

MED_restart_data="@[plat%BASELINE]/MEDIATOR_debug_ccpp"

build=fv3_ccpp_mom6_cice_debug.exe
Expand Down
Loading

0 comments on commit b116b71

Please sign in to comment.