Skip to content

Transition CCPP to ufs-s2s-model (contains #7) #64

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
DeniseWorthen merged 15 commits into from
Apr 2, 2020
Merged

Transition CCPP to ufs-s2s-model (contains #7) #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
69fbaf0
added ccpp to the coupled system
linlin-pan Dec 2, 2019
9b90d1f
Merge pull request #1 from ufs-community/develop
panll Jan 22, 2020
088373b
adding ccpp into s2s coupled system
linlin-pan Jan 22, 2020
bdf0f6f
Merge branch 'develop' of https://github.com/panll/ufs-s2s-model into…
climbfuji Mar 24, 2020
633a33d
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Mar 27, 2020
21bb7f2
Add IPD REPRO, CCPP REPRO, CCPP PROD tests for NEMSCompsetRun
climbfuji Mar 27, 2020
07c710f
Bugfix, correct regression test baselines for several tests
climbfuji Mar 27, 2020
e1f7ce8
Update parm/REGTEST-FINGERPRINT.md and submodule pointer for fv3atm
climbfuji Mar 27, 2020
4f60a1b
For warm start tests, look for mediator files in RESTART directories …
climbfuji Mar 27, 2020
794fee2
Activate CCPP REPRO tests for verification against own baseline
climbfuji Mar 30, 2020
881e67c
Python script create_baseline.py (temporary) for creating baseline di…
climbfuji Mar 30, 2020
9e39c84
Revert change to .gitmodules following the merge of PR #86 (Regain bi…
climbfuji Mar 30, 2020
d179cc3
Update regression test baseline location on hera; remove redunant 're…
climbfuji Mar 30, 2020
a639b5f
Regression test logs from NEMSCompsetRun on hera.intel
climbfuji Mar 30, 2020
6e607d8
coupledFV3_CCPP_MOM6_CICE_debug.appBuilder: bugfix, need to add CCPP …
climbfuji Mar 31, 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 515a83 to 083dc6
74 changes: 73 additions & 1 deletion compsets/all.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
load 'fv3mom6cice5.input'
load 'fv3mom6cice5_ccpp.input'
Comment thread
DeniseWorthen marked this conversation as resolved.

########################################################################
#Run the standard Regression tests

# Run the standard Regression tests - IPD PROD

run cpld_fv3_mom6_cice_cold_atm_flux @ fv3, coupledapp, cold
run cpld_fv3_384_mom6_cice_cold_atm_flux @ fv3, coupledapp, cold384
Expand All @@ -24,6 +26,76 @@ run cpld_fv3_384_mom6_cice_ww3_1d_bmark_rt @ fv3, coupledapp, warm384, physics,
#run cpld_fv3_mom6_cice_1d_gfdlmprad_gwd @ fv3, coupledapp, warm, physics
#run cpld_fv3_mom6_cice_1d_gfdlmprad_noahmp @ fv3, coupledapp, warm, physics

# Run the standard Regression tests - IPD REPRO

run cpld_fv3_mom6_cice_cold_atm_flux_repro @ fv3, coupledapp, cold
run cpld_fv3_384_mom6_cice_cold_atm_flux_repro @ fv3, coupledapp, cold384

run cpld_fv3_mom6_cice_2d_atm_flux_repro @ fv3, coupledapp, warm
run cpld_fv3_384_mom6_cice_2d_atm_flux_repro @ fv3, coupledapp, warm384

run cpld_fv3_mom6_cice_2d_2threads_repro @ fv3, coupledapp, warm
run cpld_fv3_mom6_cice_2d_decomp_repro @ fv3, coupledapp, warm

run cpld_fv3_mom6_cice_cold_satmedmf_repro @ fv3, coupledapp, cold, physics
run cpld_fv3_mom6_cice_1d_satmedmf_repro @ fv3, coupledapp, warm, physics

run cpld_fv3_384_mom6_cice_cold_bmark_rt_repro @ fv3, coupledapp, coldBM, physics, bm
run cpld_fv3_384_mom6_cice_1d_bmark_rt_repro @ fv3, coupledapp, warm384, physics, bm

run cpld_fv3_384_mom6_cice_ww3_cold_bmark_rt_repro @ fv3, coupledapp, coldBM, physics, bm, ww3
run cpld_fv3_384_mom6_cice_ww3_1d_bmark_rt_repro @ fv3, coupledapp, warm384, physics, bm, ww3

#run cpld_fv3_mom6_cice_1d_gfdlmprad_gwd_repro @ fv3, coupledapp, warm, physics
#run cpld_fv3_mom6_cice_1d_gfdlmprad_noahmp_repro @ fv3, coupledapp, warm, physics

# Run the standard Regression tests - CCPP REPRO (use IPD REPRO baseline)
# comment out these tests before creating a new baseline!

run cpld_fv3_ccpp_mom6_cice_cold_atm_flux_repro @ fv3, coupledapp, cold
run cpld_fv3_ccpp_384_mom6_cice_cold_atm_flux_repro @ fv3, coupledapp, cold384

run cpld_fv3_ccpp_mom6_cice_2d_atm_flux_repro @ fv3, coupledapp, warm
run cpld_fv3_ccpp_384_mom6_cice_2d_atm_flux_repro @ fv3, coupledapp, warm384

run cpld_fv3_ccpp_mom6_cice_2d_2threads_repro @ fv3, coupledapp, warm
run cpld_fv3_ccpp_mom6_cice_2d_decomp_repro @ fv3, coupledapp, warm

run cpld_fv3_ccpp_mom6_cice_cold_satmedmf_repro @ fv3, coupledapp, cold, physics
run cpld_fv3_ccpp_mom6_cice_1d_satmedmf_repro @ fv3, coupledapp, warm, physics

run cpld_fv3_ccpp_384_mom6_cice_cold_bmark_rt_repro @ fv3, coupledapp, coldBM, physics, bm
run cpld_fv3_ccpp_384_mom6_cice_1d_bmark_rt_repro @ fv3, coupledapp, warm384, physics, bm

run cpld_fv3_ccpp_384_mom6_cice_ww3_cold_bmark_rt_repro @ fv3, coupledapp, coldBM, physics, bm, ww3
run cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt_repro @ fv3, coupledapp, warm384, physics, bm, ww3

#run cpld_fv3_ccpp_mom6_cice_1d_gfdlmprad_gwd_repro @ fv3, coupledapp, warm, physics
#run cpld_fv3_ccpp_mom6_cice_1d_gfdlmprad_noahmp_repro @ fv3, coupledapp, warm, physics

# Run the standard Regression tests - CCPP PROD

run cpld_fv3_ccpp_mom6_cice_cold_atm_flux @ fv3, coupledapp, cold
run cpld_fv3_ccpp_384_mom6_cice_cold_atm_flux @ fv3, coupledapp, cold384

run cpld_fv3_ccpp_mom6_cice_2d_atm_flux @ fv3, coupledapp, warm
run cpld_fv3_ccpp_384_mom6_cice_2d_atm_flux @ fv3, coupledapp, warm384

run cpld_fv3_ccpp_mom6_cice_2d_2threads @ fv3, coupledapp, warm
run cpld_fv3_ccpp_mom6_cice_2d_decomp @ fv3, coupledapp, warm

run cpld_fv3_ccpp_mom6_cice_cold_satmedmf @ fv3, coupledapp, cold, physics
run cpld_fv3_ccpp_mom6_cice_1d_satmedmf @ fv3, coupledapp, warm, physics

run cpld_fv3_ccpp_384_mom6_cice_cold_bmark_rt @ fv3, coupledapp, coldBM, physics, bm
run cpld_fv3_ccpp_384_mom6_cice_1d_bmark_rt @ fv3, coupledapp, warm384, physics, bm

run cpld_fv3_ccpp_384_mom6_cice_ww3_cold_bmark_rt @ fv3, coupledapp, coldBM, physics, bm, ww3
run cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt @ fv3, coupledapp, warm384, physics, bm, ww3

#run cpld_fv3_ccpp_mom6_cice_1d_gfdlmprad_gwd @ fv3, coupledapp, warm, physics
#run cpld_fv3_ccpp_mom6_cice_1d_gfdlmprad_noahmp @ fv3, coupledapp, warm, physics

########################################################################
#Run the Benchmark-like inputs for a single date
#These can be run separately from the baseline test cases
Expand Down
107 changes: 107 additions & 0 deletions compsets/benchmarkRT_ccpp_cold.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
########################################################################

test cpld_fv3_ccpp_384_mom6_cice_cold_bmark_rt: fv3_ccpp_mom6_cice.exe {
use cpld_fv3_ccpp_mom6_cice_cold_atm_flux
use plat%default_cpl_benchmark

ATMRES='384'
TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE system - cold 384"
CNTL_NAME="RT-Baselines_cold_bmrt_ccpp"
CNTLMED="@[plat%BASELINE]/MEDIATOR_bmrt_ccpp"

DT_ATMOS='450'
NPX='385'
NPY='385'
IMO='1536'
JMO='768'
FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"

FV3_mosaic="C@[ATMRES]"

# inputs and fixed files for benchmark runs to match workflow
INPUT_NML="input.benchmark_ccpp.nml.IN"
SUITE_NAME='FV3_GFS_v15p2_coupled'
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"

# - set date YYYYMMDDHH
SYEAR='2013'
SMONTH='04'
SDAY='01'
SHOUR='00'
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"

# - set run type for CICE in ice_in
RUNID='cpcice'

# - set initialization type for MOM6
MOM6_RESTART_SETTING = 'r'

# set locations of ICs
BM_IC="@[plat%INPUTS]/BM_IC/@[CDATE]"
FV3_IC="@[BM_IC]/gfs/C384/INPUT"
MOM6_IC="@[BM_IC]/mom6_da"
CICE5_IC="@[BM_IC]/cpc"

spawn execute {
{"@[build%target]", ranks="@[TASKS]", threads="@[THRD]", ppn="@[TPN]" }
}
}

test cpld_fv3_ccpp_384_mom6_cice_cold_bmark_rt_repro: fv3_ccpp_mom6_cice_repro.exe {
use cpld_fv3_ccpp_mom6_cice_cold_atm_flux_repro
use plat%default_cpl_benchmark

ATMRES='384'
TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE system - cold 384 - repro"
CNTL_NAME="RT-Baselines_cold_bmrt_repro"
CNTLMED="@[plat%BASELINE]/MEDIATOR_bmrt_repro"

DT_ATMOS='450'
NPX='385'
NPY='385'
IMO='1536'
JMO='768'
FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
FNSMCC="'global_soilmgldas.statsgo.t766.1536.768.grb',"
FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"

FV3_mosaic="C@[ATMRES]"

# inputs and fixed files for benchmark runs to match workflow
INPUT_NML="input.benchmark_ccpp.nml.IN"
SUITE_NAME='FV3_GFS_v15p2_coupled'
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"

# - set date YYYYMMDDHH
SYEAR='2013'
SMONTH='04'
SDAY='01'
SHOUR='00'
CDATE="@[SYEAR]@[SMONTH]@[SDAY]@[SHOUR]"

# - set run type for CICE in ice_in
RUNID='cpcice'

# - set initialization type for MOM6
MOM6_RESTART_SETTING = 'r'

# set locations of ICs
BM_IC="@[plat%INPUTS]/BM_IC/@[CDATE]"
FV3_IC="@[BM_IC]/gfs/C384/INPUT"
MOM6_IC="@[BM_IC]/mom6_da"
CICE5_IC="@[BM_IC]/cpc"

spawn execute {
{"@[build%target]", ranks="@[TASKS]", threads="@[THRD]", ppn="@[TPN]" }
}
}
Loading