Sm feb242020

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

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
 

compsets/hera.input

@@ -31,8 +31,8 @@ platform hera.intel {
  # INPUTS is the input directory, which should contain fix and parm
  # files, plus any restarts or other inputs.
 
- BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
- BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
+ BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200227"
+ BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200227"
  INPUTS="@[BASELINE]"
 
  default_resources={

compsets/wcoss.input

@@ -28,8 +28,8 @@ platform wcoss.phase2 {
  LONG_TEST_QUEUE='&LONGQ;'
  BUILD_QUEUE='&BUILDQ;'
  MACHINE_ID='wcoss.phase2'
- BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
- BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
+ BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227"
+ BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227"
 
  default_resources={
  TASKS=156
@@ -126,8 +126,8 @@ platform wcoss.phase1 {
  C768_THRD=4
 
  MACHINE_ID='wcoss.phase1'
- BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
- BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
+ BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227"
+ BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227"
 
  # WCOSS Phase 2 has been slow of late.
  DEFAULT_TEST_WALLTIME=2700
@@ -213,8 +213,8 @@ platform wcoss_dell_p3 {
  LONG_TEST_QUEUE='&LONGQ;'
  BUILD_QUEUE='&BUILDQ;'
 
- BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210/"
- BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210/"
+ BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227/"
+ BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227/"
 
  default_resources={
  TASKS=156
@@ -314,8 +314,8 @@ platform wcoss.cray {
  BUILD_WALLTIME="3600"
  DEFAULT_TEST_WALLTIME=1800
 
- BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
- BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200210"
+ BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227"
+ BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227"
 
  execution_time_modules=[[[
  module load alps
@@ -329,8 +329,8 @@ platform wcoss.cray {
  JNPES=8
  THRD=1
  atm_petlist_bounds="0 149"
- wav_petlist_bounds="150 263"
- CPLTASKS=264
+ wav_petlist_bounds="150 191"
+ CPLTASKS=192
  }
  default_stretched_resources={
  TASKS=48