Adding benchmark-like tests

compsets/all.input

@@ -1,5 +1,7 @@
 load 'fv3mom6cice5.input'
 load 'fv3mom6cice5_ccpp.input'
+#load 'bm3p5_cold_ccpp.input'
+#load 'bm3p5_35d_ccpp.input'
 
 ########################################################################
 
@@ -99,7 +101,7 @@ run cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt @ fv3, coupledapp, warm384, phys
 ########################################################################
 #Run the Benchmark-like inputs for a single date 
 #These can be run separately from the baseline test cases 
-#above by commenting those 4 tests out. The user must then 
+#above by commenting those 2 tests out. The user must then 
 #first run the benchmark cold start alone. The location of
 #cold start mediator files is then used to run the warm start.  
 #The full path to the cold start mediator files is specified as
@@ -112,22 +114,63 @@ run cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt @ fv3, coupledapp, warm384, phys
 #run cpld_fv3_384_mom6_cice_2d_bmark @ benchmark, warmBM2
 
 ########################################################################
-#Run the Benchmark-like inputs for 4 standard dates
+#Run the Benchmark-like inputs for 8 standard dates
 #These can be run separately from the baseline test cases
-#above by commenting those 4 tests out. The user must then
-#first run the 4 cold starts alone. The location of
+#above by commenting those 16 tests out. The user must then
+#first run the 8 cold starts alone. The location of
 #cold start mediator files is then used to run the warm starts. The
 #full path to the cold start mediator files is specified as ROOTDIR
 #in the datesuite_warm.input.
 
+#IPD Version: 
+
 #load 'datesuite_cold.input'
-#run cpld_fv3_384_mom6_cice_cold_2012010100 @ benchmark, coldBM2
-#run cpld_fv3_384_mom6_cice_cold_2012040100 @ benchmark, coldBM2
-#run cpld_fv3_384_mom6_cice_cold_2012070100 @ benchmark, coldBM2
-#run cpld_fv3_384_mom6_cice_cold_2012100100 @ benchmark, coldBM2
+#run cpld_fv3_384_mom6_cice_cold_2012010100 @ benchmark, coldBM
+#run cpld_fv3_384_mom6_cice_cold_2012040100 @ benchmark, coldBM
+#run cpld_fv3_384_mom6_cice_cold_2012070100 @ benchmark, coldBM
+#run cpld_fv3_384_mom6_cice_cold_2012100100 @ benchmark, coldBM
+#run cpld_fv3_384_mom6_cice_cold_2013010100 @ benchmark, coldBM
+#run cpld_fv3_384_mom6_cice_cold_2013040100 @ benchmark, coldBM
+#run cpld_fv3_384_mom6_cice_cold_2013070100 @ benchmark, coldBM
+#run cpld_fv3_384_mom6_cice_cold_2013100100 @ benchmark, coldBM
 
 #load 'datesuite_warm.input'
-#run cpld_fv3_384_mom6_cice_5d_2012010100 @ benchmark, warmBM2
-#run cpld_fv3_384_mom6_cice_5d_2012040100 @ benchmark, warmBM2
-#run cpld_fv3_384_mom6_cice_5d_2012070100 @ benchmark, warmBM2
-#run cpld_fv3_384_mom6_cice_5d_2012100100 @ benchmark, warmBM2
+#run cpld_fv3_384_mom6_cice_5d_2012010100 @ benchmark, warmBM
+#run cpld_fv3_384_mom6_cice_5d_2012040100 @ benchmark, warmBM
+#run cpld_fv3_384_mom6_cice_5d_2012070100 @ benchmark, warmBM
+#run cpld_fv3_384_mom6_cice_5d_2012100100 @ benchmark, warmBM
+#run cpld_fv3_384_mom6_cice_5d_2013010100 @ benchmark, warmBM
+#run cpld_fv3_384_mom6_cice_5d_2013040100 @ benchmark, warmBM
+#run cpld_fv3_384_mom6_cice_5d_2013070100 @ benchmark, warmBM
+#run cpld_fv3_384_mom6_cice_5d_2013100100 @ benchmark, warmBM
+
+#CCPP version
+
+#load 'datesuite_cold_ccpp.input'
+#run cpld_fv3_ccpp_384_mom6_cice_cold_2012010100 @ benchmark, coldBM
+#run cpld_fv3_ccpp_384_mom6_cice_cold_2012040100 @ benchmark, coldBM
+#run cpld_fv3_ccpp_384_mom6_cice_cold_2012070100 @ benchmark, coldBM
+#run cpld_fv3_ccpp_384_mom6_cice_cold_2012100100 @ benchmark, coldBM
+#run cpld_fv3_ccpp_384_mom6_cice_cold_2013010100 @ benchmark, coldBM
+#run cpld_fv3_ccpp_384_mom6_cice_cold_2013040100 @ benchmark, coldBM
+#run cpld_fv3_ccpp_384_mom6_cice_cold_2013070100 @ benchmark, coldBM
+#run cpld_fv3_ccpp_384_mom6_cice_cold_2013100100 @ benchmark, coldBM
+
+#load 'datesuite_warm_ccpp.input'
+#run cpld_fv3_ccpp_384_mom6_cice_5d_2012010100 @ benchmark, warmBM
+#run cpld_fv3_ccpp_384_mom6_cice_5d_2012040100 @ benchmark, warmBM
+#run cpld_fv3_ccpp_384_mom6_cice_5d_2012070100 @ benchmark, warmBM
+#run cpld_fv3_ccpp_384_mom6_cice_5d_2012100100 @ benchmark, warmBM
+#run cpld_fv3_ccpp_384_mom6_cice_5d_2013010100 @ benchmark, warmBM
+#run cpld_fv3_ccpp_384_mom6_cice_5d_2013040100 @ benchmark, warmBM
+#run cpld_fv3_ccpp_384_mom6_cice_5d_2013070100 @ benchmark, warmBM
+#run cpld_fv3_ccpp_384_mom6_cice_5d_2013100100 @ benchmark, warmBM
+
+# Use Benchmark inputs with CCPP version.
+# Two cold-start runs and two 35-day runs
+# Baseline results are generated.
+#run fv3_ccpp_384_mom6_cice_cold_2012010100 @ benchmark35, coldBM35
+#run fv3_ccpp_384_mom6_cice_cold_2012070100 @ benchmark35, coldBM35
+
+#run fv3_ccpp_384_mom6_cice_35d_2012010100 @ benchmark35, warmBM35
+#run fv3_ccpp_384_mom6_cice_35d_2012070100 @ benchmark35, warmBM35

compsets/benchmark_cold_ccpp.input

@@ -0,0 +1,62 @@
+########################################################################
+
+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
+
+    ATMRES='384'
+    TEST_DESCR="Fully coupled FV3-MOM6-CICE system - cold 384"
+
+    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='2012'
+    SMONTH='01'
+    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="/scratch1/NCEPDEV/nems/Bin.Li/S2S/FROM_HPSS/@[CDATE]"
+        FV3_IC="@[BM_IC]/gfs/C384/INPUT"
+       MOM6_IC="@[BM_IC]/mom6_da"
+      CICE5_IC="@[BM_IC]/cpc"    
+
+    # Specify output files:
+    criteria output {
+        # WORKFILE                            .comparison. TARGET
+      # Executable validation.  This makes an MD5 sum of the fv3.exe
+      # for comparison against the MD5 sum made in the build job.
+      # This is to ensure the executable did not change during the
+      # test suite.
+        "@[build%target]" .md5cmp. "@[fv3_ccpp_mom6_cice.exe%md5sum]" 
+    }
+
+    spawn execute { 
+        {"@[build%target]", ranks="@[TASKS]", threads="@[THRD]", ppn="@[TPN]" }
+    } 
+} 

compsets/benchmark_warm_ccpp.input

@@ -0,0 +1,83 @@
+########################################################################
+
+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
+
+    ATMRES='384'
+    TEST_DESCR="Fully coupled FV3-MOM6-CICE system - benchmark"
+
+    #For a 35 day run:
+    #DAYS='35'
+    #FHMAX='840'
+    #walltime=28800   # seconds
+    walltime=1800   # seconds
+
+    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]"
+
+    #no high freq fv3 output
+    NFHMAX_HF='-1'
+    NFHOUT_HF='-1'
+
+    # turn off CICE history averaging
+    #CICE_HIST_AVG='.false.'
+    # matching 6hour FV3 output
+    #NFHOUT='6'
+
+    # 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='2012'
+    SMONTH='01'
+    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="/scratch1/NCEPDEV/nems/Bin.Li/S2S/FROM_HPSS/@[CDATE]"
+        FV3_IC="@[BM_IC]/gfs/C384/INPUT"
+       MOM6_IC="@[BM_IC]/mom6_da"
+      CICE5_IC="@[BM_IC]/cpc"    
+
+    # set location of cold start for mediator restarts
+    # THIS IS A USER's OWN RUN and should reflect the full path to the location of the cold start
+    # eg: "/scratch2/NCEPDEV/stmp1/First.LastName/rtgen.NUMBER/tmp/cpld_fv3_ccpp_384_mom6_cice_cold_bmark"
+    MED_restart_data="full-path-to-user-coldstart"
+    RESTART_MED="mediator_*"    
+
+    # Specify output files:
+    criteria output {
+        # WORKFILE                            .comparison. TARGET
+      # Executable validation.  This makes an MD5 sum of the fv3.exe
+      # for comparison against the MD5 sum made in the build job.
+      # This is to ensure the executable did not change during the
+      # test suite.
+        "@[build%target]" .md5cmp. "@[fv3_ccpp_mom6_cice.exe%md5sum]" 
+    }
+
+    spawn execute { 
+        {"@[build%target]", ranks="@[TASKS]", threads="@[THRD]", ppn="@[TPN]" }
+    } 
+}