Merge pull request #37 from ESCOMP/katetc/renaming_0122

Name changes for pumas v1

Tag_Notes.readme

@@ -1,4 +1,8 @@
 ====================================
+.. pumas_cam-release_v1.22
+Jan 19, 2022 - Renames for pumas_v1 and use in cam_dev from here on. All changes required to run 
+the head of pumas/cam/release will be integrated into cam_dev physics in cam6_3_046, most likely.
+====================================
 .. pumas_cam-release_v1.21
 Nov 29, 2021 - Rain reflectivity bug fix. Notes from v1.19 still apply.
 ====================================

micro_pumas_data.F90

@@ -1,4 +1,4 @@
-module micro_mg_data
+module micro_pumas_data
 
 !
 ! Packing and time averaging for the MG interface.
@@ -547,4 +547,4 @@ subroutine MGPostProc_copy(lhs, rhs)
   lhs%field_procs = rhs%field_procs
 end subroutine MGPostProc_copy
 
-end module micro_mg_data
+end module micro_pumas_data

micro_pumas_utils.F90

@@ -1,4 +1,4 @@
-module micro_mg_utils
+module micro_pumas_utils
 
 !--------------------------------------------------------------------------
 !
@@ -44,7 +44,7 @@ module micro_mg_utils
 save
 
 public :: &
-     micro_mg_utils_init, &
+     micro_pumas_utils_init, &
      size_dist_param_liq, &
      size_dist_param_basic, &
      avg_diameter, &
@@ -269,7 +269,7 @@ module micro_mg_utils
 ! Constants set in initialization
 !=========================================================
 
-! Set using arguments to micro_mg_init
+! Set using arguments to micro_pumas_init
 real(r8) :: rv          ! water vapor gas constant
 real(r8) :: cpp         ! specific heat of dry air
 real(r8) :: tmelt       ! freezing point of water (K)
@@ -324,7 +324,7 @@ module micro_mg_utils
 !
 ! Check the list at the top of this module for descriptions of all other
 ! arguments.
-subroutine micro_mg_utils_init( kind, rair, rh2o, cpair, tmelt_in, latvap, &
+subroutine micro_pumas_utils_init( kind, rair, rh2o, cpair, tmelt_in, latvap, &
      latice, dcs, errstring)
 
   integer,  intent(in)  :: kind
@@ -347,7 +347,7 @@ subroutine micro_mg_utils_init( kind, rair, rh2o, cpair, tmelt_in, latvap, &
   errstring = ' '
 
   if( kind .ne. r8 ) then
-     errstring = 'micro_mg_init: KIND of reals does not match'
+     errstring = 'micro_pumas_init: KIND of reals does not match'
      return
   endif
 
@@ -391,7 +391,7 @@ subroutine micro_mg_utils_init( kind, rair, rh2o, cpair, tmelt_in, latvap, &
   !$acc                gamma_half_br_plus5,gamma_half_bs_plus5, &
   !$acc                gamma_2bs_plus2)
 
-end subroutine micro_mg_utils_init
+end subroutine micro_pumas_utils_init
 
 ! Constructor for a constituent property object.
 function NewMGHydrometeorProps(rho, eff_dim, lambda_bounds, min_mean_mass) &
@@ -2962,7 +2962,7 @@ subroutine graupel_collecting_cld_water(qgic,qcic,ncic,rho,n0g,lamg,bg,agn, &
   real(r8), dimension(vlen), intent(in) :: lamg
   real(r8), dimension(vlen), intent(in) :: n0g
   ! fallspeed parameters for graupel
-  ! Set AGN and BG  as input (in micro_mg3_0.F90)  (select hail or graupel as appropriate)
+  ! Set AGN and BG  as input (in micro_pumas_v1.F90)  (select hail or graupel as appropriate)
   real(r8),                  intent(in) :: bg
   real(r8), dimension(vlen), intent(in) :: agn
   ! Output tendencies
@@ -3335,7 +3335,7 @@ end subroutine graupel_rime_splintering
 !  real(r8), dimension(vlen), intent(in) :: sc   ! schmidt number
 !
 !  ! fallspeed parameters for graupel
-!  ! Set AGN and BG  as input (in micro_mg3_0.F90)  (select hail or graupel as appropriate)
+!  ! Set AGN and BG  as input (in micro_pumas_v1.F90)  (select hail or graupel as appropriate)
 !  real(r8),                    intent(in) :: bg
 !  real(r8), dimension(vlen), intent(in) :: agn
 !
@@ -3606,4 +3606,4 @@ pure function limiter_is_on(lim)
 
 end function limiter_is_on
 
-end module micro_mg_utils
+end module micro_pumas_utils

micro_mg3_0.F90 → micro_pumas_v1.F90

@@ -1,4 +1,4 @@
-module micro_mg3_0
+module micro_pumas_v1
 !---------------------------------------------------------------------------------
 ! Purpose:
 !   MG microphysics version 3.0 - Update of MG microphysics with
@@ -74,9 +74,9 @@ module micro_mg3_0
 ! General code structure:
 !
 ! Code is divided into two main subroutines:
-!   subroutine micro_mg_init --> initializes microphysics routine, should be called
+!   subroutine micro_pumas_init --> initializes microphysics routine, should be called
 !                                  once at start of simulation
-!   subroutine micro_mg_tend --> main microphysics routine to be called each time step
+!   subroutine micro_pumas_tend --> main microphysics routine to be called each time step
 !                                this also calls several smaller subroutines to calculate
 !                                microphysical processes and other utilities
 !
@@ -103,7 +103,7 @@ module micro_mg3_0
 !                 nucleating ice                                  -
 ! .........................................................................
 ! NOTE: List of all inputs/outputs passed through the call/subroutine statement
-!       for micro_mg_tend is given below at the start of subroutine micro_mg_tend.
+!       for micro_pumas_tend is given below at the start of subroutine micro_pumas_tend.
 !---------------------------------------------------------------------------------
 
 ! Procedures required:
@@ -120,7 +120,7 @@ module micro_mg3_0
      qsat_ice => wv_sat_qsat_ice_vect
 
 ! Parameters from the utilities module.
-use micro_mg_utils, only: &
+use micro_pumas_utils, only: &
      r8, &
      pi, &
      omsm, &
@@ -146,9 +146,9 @@ module micro_mg3_0
 save
 
 public :: &
-     micro_mg_init, &
-     micro_mg_get_cols, &
-     micro_mg_tend
+     micro_pumas_init, &
+     micro_pumas_get_cols, &
+     micro_pumas_tend
 
 ! Switches for specification rather than prediction of droplet and crystal number
 ! note: number will be adjusted as needed to keep mean size within bounds,
@@ -233,7 +233,7 @@ module micro_mg3_0
 ! Constants set in initialization
 !=========================================================
 
-! Set using arguments to micro_mg_init
+! Set using arguments to micro_pumas_init
 real(r8) :: g           ! gravity
 real(r8) :: r           ! dry air gas constant
 real(r8) :: rv          ! water vapor gas constant
@@ -322,7 +322,7 @@ module micro_mg3_0
 contains
 !===============================================================================
 
-subroutine micro_mg_init( &
+subroutine micro_pumas_init( &
      kind, gravit, rair, rh2o, cpair,    &
      tmelt_in, latvap, latice,           &
      rhmini_in, micro_mg_dcs,            &
@@ -342,7 +342,7 @@ subroutine micro_mg_init( &
      nrcons_in, nrnst_in, nscons_in, nsnst_in, &
      errstring)
 
-  use micro_mg_utils, only: micro_mg_utils_init
+  use micro_pumas_utils, only: micro_pumas_utils_init
 
   !-----------------------------------------------------------------------
   !
@@ -428,7 +428,7 @@ subroutine micro_mg_init( &
   dcs = micro_mg_dcs
 
   ! Initialize subordinate utilities module.
-  call micro_mg_utils_init(kind, rair, rh2o, cpair, tmelt_in, latvap, latice, &
+  call micro_pumas_utils_init(kind, rair, rh2o, cpair, tmelt_in, latvap, latice, &
        dcs, errstring)
 
   if (trim(errstring) /= "") return
@@ -546,12 +546,12 @@ subroutine micro_mg_init( &
   !$acc                micro_mg_effi_factor,micro_mg_iaccr_factor,             &
   !$acc                micro_mg_max_nicons,do_implicit_fall,accre_sees_auto)
 
-end subroutine micro_mg_init
+end subroutine micro_pumas_init
 
 !===============================================================================
 !microphysics routine for each timestep goes here...
 
-subroutine micro_mg_tend ( &
+subroutine micro_pumas_tend ( &
      mgncol,             nlev,               deltatin,           &
      t,                            q,                            &
      qcn,                          qin,                          &
@@ -620,7 +620,7 @@ subroutine micro_mg_tend ( &
      frzimm,             frzcnt,             frzdep)
 
   ! Constituent properties.
-  use micro_mg_utils, only: &
+  use micro_pumas_utils, only: &
        mg_liq_props, &
        mg_ice_props, &
        mg_rain_props, &
@@ -629,14 +629,14 @@ subroutine micro_mg_tend ( &
        mg_snow_props
 
   ! Size calculation functions.
-  use micro_mg_utils, only: &
+  use micro_pumas_utils, only: &
        size_dist_param_liq, &
        size_dist_param_basic, &
        avg_diameter, &
        avg_diameter_vec
 
   ! Microphysical processes.
-  use micro_mg_utils, only: &
+  use micro_pumas_utils, only: &
        ice_deposition_sublimation, &
        sb2001v2_liq_autoconversion,&
        sb2001v2_accre_cld_water_rain,&       
@@ -4170,7 +4170,7 @@ subroutine micro_mg_tend ( &
 
   !$acc end data
 
-end subroutine micro_mg_tend
+end subroutine micro_pumas_tend
 
 !========================================================================
 !OUTPUT CALCULATIONS
@@ -4431,7 +4431,7 @@ end subroutine Sedimentation_implicit
 !========================================================================
 
 
-pure subroutine micro_mg_get_cols(ncol, nlev, top_lev, mgncol, mgcols, &
+pure subroutine micro_pumas_get_cols(ncol, nlev, top_lev, mgncol, mgcols, &
      qcn, qin, qrn, qsn, qgr)
 
   ! Determines which columns microphysics should operate over by
@@ -4481,7 +4481,7 @@ pure subroutine micro_mg_get_cols(ncol, nlev, top_lev, mgncol, mgcols, &
      end if
   end do
 
-end subroutine micro_mg_get_cols
+end subroutine micro_pumas_get_cols
 
 ! =======================================================================
 ! time - implicit monotonic scheme
@@ -4572,4 +4572,4 @@ subroutine implicit_fall (dt, mgncol, ktop, kbot, ze, vt, dp, q, precip, m1)
 end subroutine implicit_fall
 
 
-end module micro_mg3_0
+end module micro_pumas_v1