Changes for CAM7

src/physics/cam7/physpkg.F90

@@ -743,7 +743,7 @@ subroutine phys_init( phys_state, phys_tend, pbuf2d, cam_in, cam_out )
     use conv_water,         only: conv_water_init
     use tracers,            only: tracers_init
     use aoa_tracers,        only: aoa_tracers_init
-    use rayleigh_friction,  only: rayleigh_friction_init
+    use rayleigh_friction_cam,  only: rayleigh_friction_initO
     use pbl_utils,          only: pbl_utils_init
     use vertical_diffusion, only: vertical_diffusion_init
     use phys_debug_util,    only: phys_debug_init
@@ -877,7 +877,7 @@ subroutine phys_init( phys_state, phys_tend, pbuf2d, cam_in, cam_out )
 
     call gw_init()
 
-    call rayleigh_friction_init()
+    call rayleigh_friction_initO()
 
     call pbl_utils_init(gravit, karman, cpair, rair, zvir)
     call vertical_diffusion_init(pbuf2d)
@@ -1358,7 +1358,7 @@ subroutine tphysac (ztodt,   cam_in,  &
     use cam_diagnostics,    only: diag_phys_tend_writeout
     use gw_drag,            only: gw_tend
     use vertical_diffusion, only: vertical_diffusion_tend
-    use rayleigh_friction,  only: rayleigh_friction_tend
+    use rayleigh_friction_cam,  only: rayleigh_friction_tendO
     use physics_types,      only: physics_dme_adjust, set_dry_to_wet, physics_state_check,       &
                                   dyn_te_idx
     use waccmx_phys_intr,   only: waccmx_phys_mspd_tend  ! WACCM-X major diffusion
@@ -2168,7 +2168,7 @@ subroutine tphysac (ztodt,   cam_in,  &
        call cam_snapshot_all_outfld_tphysac(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
             fh2o, surfric, obklen, flx_heat, cmfmc, dlf, det_s, det_ice, net_flx)
     end if
-    call rayleigh_friction_tend( ztodt, state, ptend)
+    call rayleigh_friction_tendO( ztodt, state, ptend)
     if ( (trim(cam_take_snapshot_after) == "rayleigh_friction_tend") .and.      &
          (trim(cam_take_snapshot_before) == trim(cam_take_snapshot_after))) then
        call cam_snapshot_ptend_outfld(ptend, lchnk)