Accumulation of changes to RRTMGP

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/dustinswales/fv3atm
+  branch = addLWadj_fullProfile
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

tests/fv3_conf/gfs_v15_run.IN

@@ -20,4 +20,5 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
 
 if [ $DO_RRTMGP = .T. ]; then
 cp    @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+cp /scratch2/BMC/ome/Dustin.Swales/UFS/ufs-weather-model-2/FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/data/* .
 fi

tests/fv3_conf/gfs_v16_run.IN

@@ -30,4 +30,5 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1
 
 if [ $DO_RRTMGP = .T. ]; then
   cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+  cp /scratch2/BMC/ome/Dustin.Swales/UFS/ufs-weather-model-2/FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/data/* .
 fi

tests/fv3_conf/gsd_run.IN

@@ -68,3 +68,7 @@ if [ $GWD_OPT = 3 ] || [ $GWD_OPT = 33 ] || [ $GWD_OPT = 2 ] || [ $GWD_OPT = 22
   cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/drag_suite/* INPUT/
 fi
 
+if [ $DO_RRTMGP = .T. ]; then
+  cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+  cp /scratch2/BMC/ome/Dustin.Swales/UFS/ufs-weather-model-2/FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/data/* .
+fi

tests/fv3_conf/regional_run.IN

@@ -42,3 +42,8 @@ elif [[ $POSTAPP = 'hafs' ]]; then
     cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT_FH00.txt
     cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
 fi
+
+if [ $DO_RRTMGP = .T. ]; then
+  cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+  cp /scratch2/BMC/ome/Dustin.Swales/UFS/ufs-weather-model-2/FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/data/* .
+fi

tests/parm/gsd_rrtmgp.nml.IN

@@ -132,9 +132,11 @@
        pdfcld         = .false.
        fhswr          = 3600.
        fhlwr          = 3600.
-       ialb           = 1
-       iems           = 1
-       iaer           = 111
+       ialb           = @[IALB]
+       iems           = @[IEMS]
+       iaer           = @[IAER]
+       icliq_sw       = @[ICLIQ_SW]
+       iovr           = @[IOVR]
        ico2           = 2
        isubc_sw       = 2
        isubc_lw       = 2
@@ -147,7 +149,8 @@
        redrag         = .true.
        dspheat        = .true.
        hybedmf        = @[HYBEDMF]
-       satmedmf       = .false.
+       satmedmf       = @[SATMEDMF]
+       isatmedmf      = 1
        lheatstrg      = @[LHEATSTRG]
        do_mynnedmf    = @[DO_MYNNEDMF]
        do_mynnsfclay  = @[DO_MYNNSFCLAY]
@@ -174,8 +177,10 @@
        do_skeb        = @[DO_SKEB]
        lndp_type      = @[LNDP_TYPE]
        n_var_lndp     = @[N_VAR_LNDP]
+       lndp_each_step = @[LNDP_EACH_STEP]
        lsm            = @[LSM]
        lsoil_lsm      = @[LSOIL_LSM]
+       kice           = @[KICE]
        iopt_dveg      = 2
        iopt_crs       = 1
        iopt_btr       = 1
@@ -192,19 +197,31 @@
        bl_mynn_tkeadvect = .true.
        bl_mynn_edmf      = 1
        bl_mynn_edmf_mom  = 1
-       gwd_opt        = @[GWD_OPT]
-       do_RRTMGP          = .true.
-       active_gases       = 'h2o_co2_o3_n2o_ch4_o2'
-       ngases             = 6
-       lw_file_gas        = 'rrtmgp-data-lw-g256-2018-12-04.nc'
-       lw_file_clouds     = 'rrtmgp-cloud-optics-coeffs-lw.nc'
-       sw_file_gas        = 'rrtmgp-data-sw-g224-2018-12-04.nc'
-       sw_file_clouds     = 'rrtmgp-cloud-optics-coeffs-sw.nc'
-       doGP_cldoptics_LUT = .true.
-       doGP_lwscat        = .true.
-       use_LW_jacobian    = .true.
-       rrtmgp_ngauss_ang  = 3
-       rrtmgp_nrghice     = 3
+       gwd_opt              = @[GWD_OPT]
+       ldiag_ugwp           = @[LDIAG_UGWP]
+       do_ugwp              = @[DO_UGWP]
+       do_tofd              = @[DO_TOFD]
+       do_ugwp_v0           = @[DO_UGWP_V0]
+       do_ugwp_v0_orog_only = @[DO_UGWP_V0_OROG_ONLY]
+       do_gsl_drag_ls_bl    = @[DO_GSL_DRAG_LS_BL]
+       do_gsl_drag_ss       = @[DO_GSL_DRAG_SS]
+       do_gsl_drag_tofd     = @[DO_GSL_DRAG_TOFD]
+       do_ugwp_v1           = @[DO_UGWP_V1]
+       do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY]
+       do_RRTMGP            = .true.
+       active_gases         = 'h2o_co2_o3_n2o_ch4_o2'
+       ngases               = 6
+       lw_file_gas          = 'rrtmgp-lw-prototype-g128-210413.nc'
+       lw_file_clouds       = 'rrtmgp-cloud-optics-coeffs-lw.nc'
+       sw_file_gas          = 'rrtmgp-sw-prototype-g131-210413.nc'
+       sw_file_clouds       = 'rrtmgp-cloud-optics-coeffs-sw.nc'
+       rrtmgp_nGptsSW       = 131
+       rrtmgp_nGptsLW       = 128
+       rrtmgp_nBandsLW      = 16
+       rrtmgp_nBandsSW      = 14
+       doGP_cldoptics_LUT   = .true.
+       doGP_lwscat          = .true.
+       use_LW_jacobian      = .true.
 /
 
 &gfdl_cloud_microphysics_nml
@@ -303,32 +320,35 @@
        FSICS    = 99999,
 /
 &nam_stochy
-  lon_s=768,
-  lat_s=384,
-  ntrunc=382,
   SKEBNORM=1,
   SKEB_NPASS=30,
   SKEB_VDOF=5,
   SKEB=@[SKEB],
   SKEB_TAU=2.16E4,
   SKEB_LSCALE=1000.E3,
+  SKEBINT=1800,
   SHUM=@[SHUM],
   SHUM_TAU=21600,
   SHUM_LSCALE=500000,
+  SHUMINT=3600,
   SPPT=@[SPPT],
   SPPT_TAU=21600,
   SPPT_LSCALE=500000,
   SPPT_LOGIT=.TRUE.,
   SPPT_SFCLIMIT=.TRUE.,
+  SPPTINT=1800,
   ISEED_SHUM=1,
   ISEED_SKEB=2,
   ISEED_SPPT=3,
 /
+
 &nam_sfcperts
   lndp_type      = @[LNDP_TYPE]
   LNDP_TAU=21600,
   LNDP_LSCALE=500000,
   ISEED_LNDP=2010,
+  lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol'
+  lndp_prt_list = 0.200, 0.001, 0.001, 0.001, 0.001, 0.001
 /
 
 &cires_ugwp_nml
@@ -345,3 +365,4 @@
        knob_ugwp_version = 0
        launch_level      = 25
 /
+