Merge pull request #1376 from cacraigucar/cam_mods_for_cecile

cacraigucar · web-flow · commit 717103fc96f5 · 2025-09-08T10:48:44.000-06:00
Changes to support Cecile's latest runs
diff --git a/.gitmodules b/.gitmodules
@@ -29,7 +29,7 @@
 [submodule "atmos_phys"]
 	path = src/atmos_phys
 	url = https://github.com/ESCOMP/atmospheric_physics
-        fxtag = atmos_phys0_16_001
+        fxtag = atmos_phys0_16_002
         fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
@@ -80,7 +80,7 @@
 	path = src/physics/rrtmgp/ext
 	url = https://github.com/earth-system-radiation/rte-rrtmgp.git
         fxrequired = AlwaysRequired
-        fxtag = v1.7
+	fxtag = v1.9.2
         fxDONOTUSEurl = https://github.com/earth-system-radiation/rte-rrtmgp.git
 
 [submodule "rrtmgp-data"]
diff --git a/bld/build-namelist b/bld/build-namelist
@@ -3373,7 +3373,7 @@ if ($cfg->get('microphys') =~ /^mg/) {
             $micro_mg_dcs = '500.D-6';
         }
         elsif ($phys eq 'cam7') {
-            $micro_mg_dcs = '500.D-6';
+            $micro_mg_dcs = '600.D-6';
         }
     }
 
diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
@@ -307,7 +307,7 @@
 <bnd_topo hgrid="ne3np4"   npg="3">atm/cam/topo/se/ne3pg3_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230209.nc</bnd_topo>
 <bnd_topo hgrid="ne5np4"   npg="3">atm/cam/topo/se/ne5pg3_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw064_20170516.nc</bnd_topo>
 <bnd_topo hgrid="ne16np4"  npg="3">atm/cam/topo/se/ne16pg3_gmted2010_modis_bedmachine_nc3000_Laplace0200_20230202.nc</bnd_topo>
-<bnd_topo hgrid="ne30np4"  npg="3">atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240720.nc</bnd_topo>
+<bnd_topo hgrid="ne30np4"  npg="3">atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_greenlndantarcsgh30fac2.50_20250828.nc</bnd_topo>
 <bnd_topo hgrid="ne60np4"  npg="3">atm/cam/topo/se/ne60pg3_nc3000_Co030_Fi001_PF_nullRR_Nsw021_20171012.nc</bnd_topo>
 <bnd_topo hgrid="ne120np4" npg="3">atm/cam/topo/se/ne120pg3_nc3000_Co015_Fi001_PF_nullRR_Nsw010_20171014.nc</bnd_topo>
 <bnd_topo hgrid="ne240np4" npg="3">atm/cam/topo/se/ne240pg3_nc3000_Co008_Fi001_PF_nullRR_Nsw005_20171015.nc</bnd_topo>
@@ -2124,7 +2124,7 @@
 <clubb_C7 phys="cam7"                             > 0.1     </clubb_C7>
 <clubb_C7b                                        > 0.5     </clubb_C7b>
 <clubb_C8                                         > 4.2     </clubb_C8>
-<clubb_C8 phys="cam7"                             > 4.5     </clubb_C8>
+<clubb_C8 phys="cam7"                             > 4.6     </clubb_C8>
 <clubb_C8b                                        > 0.0     </clubb_C8b>
 <clubb_C_invrs_tau_bkgnd                          > 1.0     </clubb_C_invrs_tau_bkgnd>
 <clubb_C_invrs_tau_sfc                            > 0.1     </clubb_C_invrs_tau_sfc>
@@ -2680,7 +2680,7 @@
 <cldfrc_dp1                                                           > 0.14D0 </cldfrc_dp1>
 <cldfrc_dp1             phys="cam5"                                   > 0.10D0 </cldfrc_dp1>
 <cldfrc_dp1             phys="cam6"                                   > 0.10D0 </cldfrc_dp1>
-<cldfrc_dp1             phys="cam7"                                   > 0.10D0 </cldfrc_dp1>
+<cldfrc_dp1             phys="cam7"                                   > 0.05D0 </cldfrc_dp1>
 <cldfrc_dp1 dyn="fv"    phys="cam4"                                   > 0.10D0 </cldfrc_dp1>
 <cldfrc_dp1 dyn="se"    phys="cam4"                                   > 0.10D0 </cldfrc_dp1>
 
diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml
@@ -2,7 +2,7 @@
 <namelist_defaults>
 
 <!-- Solar data from NRL -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6piControl_c160921.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7piControl_c20250103.nc</solar_irrad_data_file>
 <solar_data_ymd>   18500101           </solar_data_ymd>
 <solar_data_type>    FIXED            </solar_data_type>
 
diff --git a/bld/namelist_files/use_cases/1850_cam_mt.xml b/bld/namelist_files/use_cases/1850_cam_mt.xml
@@ -2,7 +2,7 @@
 <namelist_defaults>
 
 <!-- Solar data from NRL -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6piControl_c160921.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7piControl_c20250103.nc</solar_irrad_data_file>
 <solar_data_ymd>   18500101           </solar_data_ymd>
 <solar_data_type>    FIXED            </solar_data_type>
 
diff --git a/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml b/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml
@@ -6,7 +6,7 @@
 <ncdata hgrid="ne30np4" nlev="93">atm/cam/inic/se/1850C_T4S_ne30pg3_spinup01.cam.i.0002-01-01_c241114.nc</ncdata>
 
 <!-- Solar data -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
 <solar_data_type>FIXED</solar_data_type>
 <solar_data_ymd>18500701</solar_data_ymd>
 
diff --git a/bld/namelist_files/use_cases/hist_cam_lt.xml b/bld/namelist_files/use_cases/hist_cam_lt.xml
@@ -4,7 +4,7 @@
 <start_ymd>19790101</start_ymd>
 
 <!-- Solar data from NRL -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
 
 <!-- LBC Files -->
 <flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
diff --git a/bld/namelist_files/use_cases/hist_cam_mt.xml b/bld/namelist_files/use_cases/hist_cam_mt.xml
@@ -4,7 +4,7 @@
 <start_ymd>19790101</start_ymd>
 
 <!-- Solar data from NRL -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
 
 <!-- LBC Files -->
 <flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
diff --git a/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml b/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml
@@ -6,7 +6,7 @@
 <ncdata hgrid="ne30np4">atm/cam/inic/se/f.cam6_3_153.FCMTnudged_climate_chemistry_ne30.factor_fix.cam.i.1996-01-01-00000_c220522.nc</ncdata>
 
 <!-- Solar data -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
 <solar_data_type>SERIAL</solar_data_type>
 
 <!-- Emissions -->
diff --git a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml
@@ -5,13 +5,13 @@
 <start_ymd>19790101</start_ymd>
 
 <!-- Solar data from NRL -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
 
 <!-- Kp and F10.7 -->
-<solar_parms_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_parms_data_file>
+<solar_parms_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_parms_data_file>
 
 <!-- Energetic Particle Precipitation -->
-<epp_all_filepath>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</epp_all_filepath>
+<epp_all_filepath>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</epp_all_filepath>
 <epp_all_varname>'epp_ion_rates'</epp_all_varname>
 
 <!--Species IC -->
diff --git a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml
@@ -5,10 +5,10 @@
 <start_ymd>19790101</start_ymd>
 
 <!-- Solar data from NRL -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
 
 <!-- Kp and F10.7 -->
-<solar_parms_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_parms_data_file>
+<solar_parms_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_parms_data_file>
 
 <!--Species IC -->
 <ncdata dyn="se" hgrid="ne30np4" nlev="135">atm/waccm/ic/FHIST_WAt1ma_ne30pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc</ncdata>
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,123 @@
+
+===============================================================
+
+Tag name: cam6_4_114
+Originator(s): cacraigucar, hannay, peverwhee, PeterHjortLauritzen
+Date: September 8, 2025
+One-line Summary: Changes to support Cecile's latest runs
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1376
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+    - Match new (coupled) baseline out-of-the-box:  https://github.com/ESCOMP/CAM/issues/1357
+    - Changed various CAM7 namelist settings
+    - Updated RRTMGP external library
+
+Describe any changes made to build system: N/A
+
+Describe any changes made to the namelist:
+  - Change default settings for CAM7 settings of:
+        micro_mg_dcs
+	bnd_topo
+	clubb_C8
+	cldfrc_dp1
+	solar_irrad_data
+
+List any changes to the defaults for the boundary datasets: N/A
+
+Describe any substantial timing or memory changes: N/A
+
+Code reviewed by: adamrher, PeterHjortLauritzen, cecilehannay
+
+List all files eliminated: N/A
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+M       .gitmodules
+            - Update atmos_phys external
+	    - Update RRTMGP external
+
+M       bld/build-namelist
+            - Update micro_mg_dcs default
+
+M       bld/namelist_files/namelist_defaults_cam.xml
+            - Update other namelist defaults
+
+M       bld/namelist_files/use_cases/1850_cam_lt.xml
+M       bld/namelist_files/use_cases/1850_cam_mt.xml
+M       bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml
+M       bld/namelist_files/use_cases/hist_cam_lt.xml
+M       bld/namelist_files/use_cases/hist_cam_mt.xml
+M       bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml
+M       bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml
+M       bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml
+            - Update SolarForcing file for CAM7 runs
+
+M       src/atmos_phys
+M       src/physics/rrtmgp/ext
+            - Update submodules
+
+M       src/physics/rrtmgp/radiation.F90
+            - Changes necessary to work with updated RRTMGP library
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+derecho/intel/aux_cam:
+  SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
+    - pre-existing failure due to build-namelist error requiring CLM/CTSM external update.
+
+  ERC_D_Ln9.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
+  ERC_D_Ln9.mpasa120_mpasa120.QPC7.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
+  ERC_D_Ln9.ne30pg2_ne30pg2_mt232.QPC7.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERI_D_Ln18.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq3s_eri (Overall: DIFF) details:
+  ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d (Overall: DIFF) details:
+  ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
+  ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERR_Ln9.ne16pg3_ne16pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s_bwic (Overall: DIFF) details:
+  ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s_ctem (Overall: DIFF) details:
+  SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
+  SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
+  SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp (Overall: DIFF) details:
+    - Answer changes due to CAM7 namelist settings, an updated topo file and updated RRTMGP library
+
+derecho/nvhpc/aux_cam:
+  ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: FAIL) details:
+    - New RRTMGP library breaks GPU test
+        - See issue: https://github.com/ESCOMP/CAM/issues/1383
+
+izumi/nag/aux_cam:
+  ERC_D_Ln9.mpasa480_mpasa480_mt232.QPC7.izumi_nag.cam-outfrq9s_mpasa480 (Overall: DIFF) details:
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-cosp_rad_diags (Overall: DIFF) details:
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-outfrq9s_nochem (Overall: DIFF) details:
+    - Answer changes due to CAM7 namelist settings, an updated topo file and updated RRTMGP library
+
+
+izumi/gnu/aux_cam:
+  ERC_D_Ln9.mpasa480_mpasa480_mt232.FHISTC_LTso.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF) details:
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_gnu.cam-sat_lcltod (Overall: DIFF) details:
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.QPC7.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln3.ne3pg3_ne3pg3_mt232.PC7.izumi_gnu.cam-pc7_ne3pg3 (Overall: DIFF) details:
+    - Answer changes due to CAM7 namelist settings, an updated topo file and updated RRTMGP library
+
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers, i.e.,
+- what code configurations: Any configuration which uses RRTMGP
+- what platforms/compilers: all
+- nature of change (roundoff; larger than roundoff but same climate; new
+  climate): larger than roundoff but same climate
+
+- Brian Mederios made a run with this new library and AMP scientists viewed the results and okayed the changes
+
+===============================================================
 ===============================================================
 
 Tag name: cam6_4_113
@@ -51,7 +171,7 @@ cime_config/testdefs/testlist_cam.xml
 . add subcol test on SE grid
   replace
   SUB_D_Ln9.f10_f10_mg37.QPC5.izumi_nag.cam-outfrq3s
-  by  
+  by
   SUB_D_Ln9.ne3pg3_ne3pg3_mt232.FHIST.izumi_gnu.cam-outfrq9s
 . move subcol test to F compset
   replace
@@ -65,7 +185,7 @@ cime_config/testdefs/testlist_cam.xml
   by
   ERC_D_Ln9.ne3pg3_ne3pg3_mt232.QPC4.izumi_nag.cam-outfrq9s
 . move cam4 ERI test to F compset.
-  replace 
+  replace
   ERI_D_Ln18.f45_f45_mg37.QPC41850.derecho_intel.cam-co2rmp_usecase
   by
   ERI_D_Ln18.ne16pg3_ne16pg3_mt232.FHIST_C4.derecho_intel.cam-outfrq3s_eri
@@ -374,7 +494,7 @@ If this tag changes climate describe the run(s) done to evaluate the new
 climate in enough detail that it(they) could be reproduced, i.e.,
 - source tag (all code used must be in the repository): https://github.com/NCAR/CAM-ACOM-dev/tree/develop-cloud-bug-fix d1358e4
 - platform/compilers: Derecho/Intel
-- configure commandline: 
+- configure commandline:
     ./create_newcase --compset FCnudged --res f09_f09_mg17 --case /glade/work/tilmes/derecho/cesm3/FCnudged_f09.cloud-bug-fix.2015_2018.001 --project P93300043 --run-unsupported
     ./create_newcase --compset FCARMAnudged --res f09_f09_mg17 --case /glade/work/tilmes/derecho/cesm3/FCARMAnudged_f09.cloud-bug-fix.2015_2018.001 --project P93300043 --run-unsupported
 - build-namelist command (or complete namelist):
diff --git a/src/atmos_phys b/src/atmos_phys
@@ -1 +1 @@
-Subproject commit 470f1fee56af645c44493afab6c042d2d15e9311
+Subproject commit 0666731e19797b1bbbbd6fe9ffb20faa7e3b821f
diff --git a/src/physics/rrtmgp/ext b/src/physics/rrtmgp/ext
@@ -1 +1 @@
-Subproject commit 4d8c5df4c63434aaab854afd1b02f5986d41dfb3
+Subproject commit 77ff83ccf645e5bc404c138ca4e7a6e3abf5d963
diff --git a/src/physics/rrtmgp/radiation.F90 b/src/physics/rrtmgp/radiation.F90
@@ -50,6 +50,7 @@ module radiation
 use ccpp_source_functions,   only: ty_source_func_lw_ccpp
 use ccpp_fluxes,             only: ty_fluxes_broadband_ccpp
 use ccpp_fluxes_byband,    only: ty_fluxes_byband_ccpp
+use mo_rte_kind,           only: wl
 
 use string_utils,        only: to_lower
 use cam_abortutils,      only: endrun, handle_allocate_error
@@ -1216,7 +1217,7 @@ subroutine radiation_tend( &
 
                   ! Compute clear-sky fluxes.
                   errmsg = rte_sw(&
-                     atm_optics_sw%optical_props, top_at_1, coszrs_day, toa_flux, &
+                     atm_optics_sw%optical_props, coszrs_day, toa_flux, &
                      alb_dir, alb_dif, fswc%fluxes)
                   call stop_on_err(errmsg, sub, 'clear-sky rte_sw')
 
@@ -1226,7 +1227,7 @@ subroutine radiation_tend( &
 
                   ! Compute all-sky fluxes.
                   errmsg = rte_sw(&
-                     atm_optics_sw%optical_props, top_at_1, coszrs_day, toa_flux, &
+                     atm_optics_sw%optical_props, coszrs_day, toa_flux, &
                      alb_dir, alb_dif, fsw%fluxes)
                   call stop_on_err(errmsg, sub, 'all-sky rte_sw')
                   !$acc end data
@@ -1321,8 +1322,7 @@ subroutine radiation_tend( &
                !$acc        copy(atm_optics_lw%optical_props, atm_optics_lw%optical_props%tau,                &
                !$acc             sources_lw%sources, sources_lw%sources%lay_source,                  &
                !$acc             sources_lw%sources%sfc_source,                  &
-               !$acc             sources_lw%sources%lev_source_inc,              &
-               !$acc             sources_lw%sources%lev_source_dec,              &
+               !$acc             sources_lw%sources%lev_source,                  &
                !$acc             sources_lw%sources%sfc_source_jac)
                call rrtmgp_lw_gas_optics_run(dolw, 1, ncol, ncol, pmid_rad, pint_rad, t_rad,  &
                   t_sfc, gas_concs_lw, atm_optics_lw, sources_lw, t_rad, .false., kdist_lw, errmsg, &
@@ -1341,8 +1341,7 @@ subroutine radiation_tend( &
                !$acc             cloud_lw%optical_props, cloud_lw%optical_props%tau,        &
                !$acc             sources_lw%sources,sources_lw%sources%lay_source,     &
                !$acc             sources_lw%sources%sfc_source,     &
-               !$acc             sources_lw%sources%lev_source_inc, &
-               !$acc             sources_lw%sources%lev_source_dec, &
+               !$acc             sources_lw%sources%lev_source,     &
                !$acc             sources_lw%sources%sfc_source_jac, &
                !$acc             emis_sfc)                          &
                !$acc        copy(flwc%fluxes, flwc%fluxes%flux_net, flwc%fluxes%flux_up, &
@@ -1351,7 +1350,7 @@ subroutine radiation_tend( &
                !$acc             lw_ds)
                call rrtmgp_lw_main_run(dolw, dolw, .false., .false., .false., &
                                  0, ncol, 1, ncol, atm_optics_lw, &
-                                 cloud_lw, top_at_1, sources_lw, emis_sfc, kdist_lw, &
+                                 cloud_lw, sources_lw, emis_sfc, kdist_lw, &
                                  aer_lw, fluxlwup_jac, lw_ds, flwc, flw, errmsg, errflg)
                if (errflg /= 0) then
                   call endrun(sub//': '//errmsg)

Original file line number	Diff line number	Diff line change
`@@ -3373,7 +3373,7 @@ if ($cfg->get('microphys') =~ /^mg/) {`
`3373`	`3373`	`$micro_mg_dcs = '500.D-6';`
`3374`	`3374`	`}`
`3375`	`3375`	`elsif ($phys eq 'cam7') {`
`3376`		`- $micro_mg_dcs = '500.D-6';`
	`3376`	`+ $micro_mg_dcs = '600.D-6';`
`3377`	`3377`	`}`
`3378`	`3378`	`}`
`3379`	`3379`