mods for compatibility of rrtmgp with cam6_3_125

brian-eaton · Sep 5, 2023 · d8edb8d · d8edb8d
1 parent e53e707
commit d8edb8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/physics/cam/aerosol_optics_cam.F90 b/src/physics/cam/aerosol_optics_cam.F90
@@ -3,7 +3,8 @@ module aerosol_optics_cam
   use shr_kind_mod, only: cl => shr_kind_cl
   use cam_logfile,  only: iulog
   use radconstants, only: nswbands, nlwbands, idx_sw_diag, idx_uv_diag, idx_nir_diag
-  use radconstants, only: ot_length, get_lw_spectral_boundaries
+  use radconstants, only: get_lw_spectral_boundaries
+  use phys_prop,    only: ot_length
   use physics_types,only: physics_state
   use physics_buffer,only: physics_buffer_desc
   use ppgrid, only: pcols, pver

diff --git a/src/physics/cam/physpkg.F90 b/src/physics/cam/physpkg.F90
@@ -853,19 +853,22 @@ subroutine phys_init( phys_state, phys_tend, pbuf2d, cam_in, cam_out )
     ! low level, so init it early. Must at least do this before radiation.
     call wv_sat_init
 
+    ! solar irradiance data modules
+    call solar_data_init()
+
     ! CAM3 prescribed aerosols
     if (cam3_aero_data_on) call cam3_aero_data_init(phys_state)
 
     ! Initialize rad constituents and their properties
     call rad_cnst_init()
+
+    call radiation_init(pbuf2d)
+
     call aer_rad_props_init()
 
     ! initialize carma
     call carma_init()
 
-    ! solar irradiance data modules
-    call solar_data_init()
-
     ! Prognostic chemistry.
     call chem_init(phys_state,pbuf2d)
 
@@ -904,8 +907,6 @@ subroutine phys_init( phys_state, phys_tend, pbuf2d, cam_in, cam_out )
        endif
     endif
 
-    call radiation_init(pbuf2d)
-
     call cloud_diagnostics_init()
 
     call radheat_init(pref_mid)