More changes!

ufs-community · Nov 7, 2024 · c05ed51 · c05ed51
1 parent ec60776
commit c05ed51
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 42 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -38,7 +38,7 @@ physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.*                               @er
 physics/MP/Ferrier_Aligo/mp_fer_hires.*                                      @ericaligo-NOAA                           @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/GFDL/GFDL_parse_tracers.F90                                                                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/GFDL/gfdl_cloud_microphys.*                                       @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
-physics/MP/GFDL/module_gfdl_cloud_microphys.*                                @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
+physics/MP/GFDL/gfdl_cloud_microphys_mod.*                                @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/GFDL/fv_sat_adj.*                                                 @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/GFDL/multi_gases.F90                                              @RuiyuSun                                 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/MP/Morrison_Gettelman/aer_cloud.F                                    @AnningCheng-NOAA @andrewgettelman        @grantfirl @rhaesung @Qingfu-Liu @dustinswales

diff --git a/physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.F90 b/physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.F90
@@ -3,9 +3,9 @@
 !! \cite chen_and_lin_2013 ).
 module gfdl_cloud_microphys
 
-   use module_gfdl_cloud_microphys, only: module_gfdl_cloud_microphys_init,   &
-                                          module_gfdl_cloud_microphys_driver, &
-                                          module_gfdl_cloud_microphys_end,    &
+   use gfdl_cloud_microphys_mod, only: gfdl_cloud_microphys_mod_init,   &
+                                          gfdl_cloud_microphys_mod_driver, &
+                                          gfdl_cloud_microphys_mod_end,    &
                                           cloud_diagnosis
 
    implicit none
@@ -63,7 +63,7 @@ subroutine gfdl_cloud_microphys_init (me, master, nlunit, input_nml_file, loguni
            return
        endif
 
-       call module_gfdl_cloud_microphys_init(me, master, nlunit, input_nml_file, logunit, fn_nml, errmsg, errflg)
+       call gfdl_cloud_microphys_mod_init(me, master, nlunit, input_nml_file, logunit, fn_nml, errmsg, errflg)
 
        is_initialized = .true.
 
@@ -89,7 +89,7 @@ subroutine gfdl_cloud_microphys_finalize(errmsg, errflg)
 
        if (.not.is_initialized) return
 
-       call module_gfdl_cloud_microphys_end()
+       call gfdl_cloud_microphys_mod_end()
 
        is_initialized = .false.
 
@@ -234,7 +234,7 @@ subroutine gfdl_cloud_microphys_run(
       snow0     = 0
       graupel0  = 0
 
-      call module_gfdl_cloud_microphys_driver(iis, iie, jjs, jje, kks, kke, ktop, kbot, &
+      call gfdl_cloud_microphys_mod_driver(iis, iie, jjs, jje, kks, kke, ktop, kbot, &
                  qv1, ql1, qr1, qi1, qs1, qg1, qa1, qn1, qv_dt, ql_dt, qr_dt, qi_dt, &
                  qs_dt, qg_dt, qa_dt, pt_dt, pt, w,  uin, vin, u_dt, v_dt, dz, delp, &
                  garea, dtp, frland, rain0, snow0, ice0, graupel0, hydrostatic,      &

diff --git a/physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.meta b/physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.meta
@@ -3,7 +3,7 @@
   type = scheme
   dependencies = ../../../hooks/machine.F
   dependencies = ../../module_mp_radar.F90
-  dependencies = module_gfdl_cloud_microphys.F90
+  dependencies = gfdl_cloud_microphys_mod.F90
   dependencies = ../module_gfdlmp_param.F90
 
 ########################################################################

diff --git a/...L/v1_2019/module_gfdl_cloud_microphys.F90 → ...GFDL/v1_2019/gfdl_cloud_microphys_mod.F90 b/...L/v1_2019/module_gfdl_cloud_microphys.F90 → ...GFDL/v1_2019/gfdl_cloud_microphys_mod.F90
@@ -28,7 +28,7 @@
 !>\defgroup mod_gfdl_cloud_mp GFDL Cloud MP modules
 !!\ingroup gfdlmp
 !! This module contains the column GFDL Cloud microphysics scheme.
-module module_gfdl_cloud_microphys
+module gfdl_cloud_microphys_mod
 
     ! use mpp_mod, only: stdlog, mpp_pe, mpp_root_pe, mpp_clock_id, &
     ! mpp_clock_begin, mpp_clock_end, clock_routine, &
@@ -46,8 +46,8 @@ module module_gfdl_cloud_microphys
 
    private
 
-   public module_gfdl_cloud_microphys_driver, module_gfdl_cloud_microphys_init, &
-          module_gfdl_cloud_microphys_end, cloud_diagnosis
+   public gfdl_cloud_microphys_mod_driver, gfdl_cloud_microphys_mod_init, &
+          gfdl_cloud_microphys_mod_end, cloud_diagnosis
 !   public wqs1, wqs2, qs_blend, wqsat_moist, wqsat2_moist
 !   public qsmith_init, qsmith, es2_table1d, es3_table1d, esw_table1d
 !   public setup_con, wet_bulb
@@ -180,7 +180,7 @@ module module_gfdl_cloud_microphys
 
 !>\ingroup mod_gfdl_cloud_mp
 !! This subroutine is the driver of the GFDL cloud microphysics
-subroutine module_gfdl_cloud_microphys_driver (                                 &
+subroutine gfdl_cloud_microphys_mod_driver (                                 &
             iis, iie, jjs, jje, kks, kke, ktop, kbot,                           &
             qv, ql, qr, qi, qs, qg, qa, qn,                                     &
             qv_dt, ql_dt, qr_dt, qi_dt, qs_dt, qg_dt, qa_dt, pt_dt, pt, w,      &
@@ -490,7 +490,7 @@ subroutine module_gfdl_cloud_microphys_driver (
        enddo
     endif
 
-end subroutine module_gfdl_cloud_microphys_driver
+end subroutine gfdl_cloud_microphys_mod_driver
 
 ! -----------------------------------------------------------------------
 !>\ingroup mod_gfdl_cloud_mp
@@ -3388,7 +3388,7 @@ end subroutine setupm
 !>\ingroup mod_gfdl_cloud_mp
 !! The subroutine 'gfdl_cloud_microphys_init' initializes the GFDL
 !! cloud microphysics.
-subroutine module_gfdl_cloud_microphys_init (me, master, nlunit, input_nml_file, logunit, &
+subroutine gfdl_cloud_microphys_mod_init (me, master, nlunit, input_nml_file, logunit, &
      fn_nml, errmsg, errflg)
 
     implicit none
@@ -3417,7 +3417,7 @@ subroutine module_gfdl_cloud_microphys_init (me, master, nlunit, input_nml_file,
     ! write version number and namelist to log file
     if (me == master) then
         write (logunit, *) " ================================================================== "
-        write (logunit, *) "module_gfdl_cloud_microphys"
+        write (logunit, *) "gfdl_cloud_microphys_mod"
         !write (logunit, nml = gfdl_cloud_microphysics_nml)
     endif
 
@@ -3503,14 +3503,14 @@ subroutine module_gfdl_cloud_microphys_init (me, master, nlunit, input_nml_file,
 
    call radar_init
 
-end subroutine module_gfdl_cloud_microphys_init
+end subroutine gfdl_cloud_microphys_mod_init
 
 ! =======================================================================
 ! end of gfdl cloud microphysics
 !>\ingroup mod_gfdl_cloud_mp
 !! The subroutine 'gfdl_cloud_microphys_init' terminates the GFDL
 !! cloud microphysics.
-subroutine module_gfdl_cloud_microphys_end()
+subroutine gfdl_cloud_microphys_mod_end()
 
     implicit none
 
@@ -3525,7 +3525,7 @@ subroutine module_gfdl_cloud_microphys_end()
 
     tables_are_initialized = .false.
 
-end subroutine module_gfdl_cloud_microphys_end
+end subroutine gfdl_cloud_microphys_mod_end
 
 ! =======================================================================
 ! qsmith table initialization
@@ -4875,4 +4875,4 @@ subroutine refl10cm_gfdl (qv1d, qr1d, qs1d, qg1d,                 &
       end subroutine refl10cm_gfdl
 !+---+-----------------------------------------------------------------+
 
-end module module_gfdl_cloud_microphys
+end module gfdl_cloud_microphys_mod
diff --git a/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.F90 b/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.F90
@@ -3,9 +3,9 @@
 !! \cite chen_and_lin_2013 ).
 module gfdl_cloud_microphys_v3
 
-   use module_gfdl_cloud_microphys_v3, only: module_gfdl_cloud_microphys_v3_init,         &
-                                             module_gfdl_cloud_microphys_v3_driver,       &
-                                             module_gfdl_cloud_microphys_v3_end,          &
+   use gfdl_cloud_microphys_v3_mod, only: gfdl_cloud_microphys_v3_mod_init,         &
+                                             gfdl_cloud_microphys_v3_mod_driver,       &
+                                             gfdl_cloud_microphys_v3_mod_end,          &
                                              rad_ref, cld_eff_rad    
 
    implicit none
@@ -66,7 +66,7 @@ subroutine gfdl_cloud_microphys_v3_init (me, master, nlunit, input_nml_file, log
            return
        endif
 
-       call module_gfdl_cloud_microphys_v3_init(me, master, nlunit, input_nml_file, logunit, fn_nml, hydrostatic, errmsg, errflg)
+       call gfdl_cloud_microphys_v3_mod_init(me, master, nlunit, input_nml_file, logunit, fn_nml, hydrostatic, errmsg, errflg)
 
        is_initialized = .true.
 
@@ -93,7 +93,7 @@ subroutine gfdl_cloud_microphys_v3_finalize(errmsg, errflg)
 
        if (.not.is_initialized) return
 
-       call module_gfdl_cloud_microphys_v3_end()
+       call gfdl_cloud_microphys_v3_mod_end()
 
        is_initialized = .false.
 
@@ -264,7 +264,7 @@ subroutine gfdl_cloud_microphys_v3_run(
         hs = oro(:) * con_g 
         gsize = sqrt(garea(:)) 
 
-        call module_gfdl_cloud_microphys_v3_driver( qv1, ql1, qr1, qi1, qs1, qg1, qa1, qnl, qni, pt, w,&
+        call gfdl_cloud_microphys_v3_mod_driver( qv1, ql1, qr1, qi1, qs1, qg1, qa1, qnl, qni, pt, w,&
                   uin, vin, dz, delp, gsize, dtp, hs, water0, rain0,                        &
                   ice0, snow0, graupel0, hydrostatic, iis, iie, kks, kke, q_con, cappa,     &
                   fast_mp_consv, adj_vmr, te, dte, prefluxw, prefluxr, prefluxi, prefluxs,  &

diff --git a/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta b/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta
@@ -2,7 +2,7 @@
   name = gfdl_cloud_microphys_v3
   type = scheme
   dependencies = ../../../hooks/machine.F
-  dependencies = module_gfdl_cloud_microphys_v3.F90
+  dependencies = gfdl_cloud_microphys_v3_mod.F90
 
 ########################################################################
 [ccpp-arg-table]

diff --git a/...3_2022/module_gfdl_cloud_microphys_v3.F90 → ...L/v3_2022/gfdl_cloud_microphys_v3_mod.F90 b/...3_2022/module_gfdl_cloud_microphys_v3.F90 → ...L/v3_2022/gfdl_cloud_microphys_v3_mod.F90
@@ -1,4 +1,4 @@
-!>\file module_gfdl_cloud_microphys_v3.F90
+!>\file gfdl_cloud_microphys_v3_mod.F90
 !! This file contains the entity of GFDL MP scheme Version 3.
 
 !***********************************************************************
@@ -35,7 +35,7 @@
 ! Version 3: Zhou et al. (2022 doi: 10.1029/2021MS002971)
 ! =======================================================================
 
-module module_gfdl_cloud_microphys_v3
+module gfdl_cloud_microphys_v3_mod
   use module_gfdlmp_param, only: cfg
     implicit none
 
@@ -78,9 +78,9 @@ module module_gfdl_cloud_microphys_v3
     ! public subroutines, functions, and variables
     ! -----------------------------------------------------------------------
 
-    public :: module_gfdl_cloud_microphys_v3_init
-    public :: module_gfdl_cloud_microphys_v3_driver
-    public :: module_gfdl_cloud_microphys_v3_end
+    public :: gfdl_cloud_microphys_v3_mod_init
+    public :: gfdl_cloud_microphys_v3_mod_driver
+    public :: gfdl_cloud_microphys_v3_mod_end
     public :: cld_sat_adj, cld_eff_rad, rad_ref
     public :: qs_init, wqs, mqs, mqs3d
     public :: c_liq, c_ice, rhow, wet_bulb
@@ -234,7 +234,7 @@ module module_gfdl_cloud_microphys_v3
 ! GFDL cloud microphysics initialization
 ! =======================================================================
 
-subroutine module_gfdl_cloud_microphys_v3_init (me, master, nlunit, input_nml_file, logunit, &
+subroutine gfdl_cloud_microphys_v3_mod_init (me, master, nlunit, input_nml_file, logunit, &
         fn_nml, hydrostatic, errmsg, errflg)
 
     implicit none
@@ -273,7 +273,7 @@ subroutine module_gfdl_cloud_microphys_v3_init (me, master, nlunit, input_nml_fi
     if (.not. exists) then
         write (6, *) 'gfdl - mp :: namelist file: ', trim (fn_nml), ' does not exist'
         errflg = 1
-        errmsg = 'ERROR(module_gfdl_cloud_microphys_v3_init): namelist file '//trim (fn_nml)//' does not exist'
+        errmsg = 'ERROR(gfdl_cloud_microphys_v3_mod_init): namelist file '//trim (fn_nml)//' does not exist'
         return
     else
         open (unit = nlunit, file = fn_nml, action = 'read' , status = 'old', iostat = ios)
@@ -306,13 +306,13 @@ subroutine module_gfdl_cloud_microphys_v3_init (me, master, nlunit, input_nml_fi
 
     call setup_mhc_lhc (hydrostatic)
 
-end subroutine module_gfdl_cloud_microphys_v3_init
+end subroutine gfdl_cloud_microphys_v3_mod_init
 
 ! =======================================================================
 ! GFDL cloud microphysics driver
 ! =======================================================================
 
-subroutine module_gfdl_cloud_microphys_v3_driver (qv, ql, qr, qi, qs, qg, qa, qnl, qni, pt, wa, &
+subroutine gfdl_cloud_microphys_v3_mod_driver (qv, ql, qr, qi, qs, qg, qa, qnl, qni, pt, wa, &
         ua, va, delz, delp, gsize, dtm, hs, water, rain, ice, snow, graupel, &
         hydrostatic, is, ie, ks, ke, q_con, cappa, consv_te, adj_vmr, te, dte, &
         prefluxw, prefluxr, prefluxi, prefluxs, prefluxg, last_step, do_inline_mp)
@@ -354,13 +354,13 @@ subroutine module_gfdl_cloud_microphys_v3_driver (qv, ql, qr, qi, qs, qg, qa, qn
         gsize, hs, q_con, cappa, consv_te, adj_vmr, te, dte, prefluxw, prefluxr, &
         prefluxi, prefluxs, prefluxg, last_step, do_inline_mp, .false., .true.)
 
-end subroutine module_gfdl_cloud_microphys_v3_driver
+end subroutine gfdl_cloud_microphys_v3_mod_driver
 
 ! =======================================================================
 ! GFDL cloud microphysics end
 ! =======================================================================
 
-subroutine module_gfdl_cloud_microphys_v3_end
+subroutine gfdl_cloud_microphys_v3_mod_end
 
     implicit none
 
@@ -381,7 +381,7 @@ subroutine module_gfdl_cloud_microphys_v3_end
 
     tables_are_initialized = .false.
 
-end subroutine module_gfdl_cloud_microphys_v3_end
+end subroutine gfdl_cloud_microphys_v3_mod_end
 
 ! =======================================================================
 ! setup cloud microphysics parameters
@@ -7370,4 +7370,4 @@ function wet_bulb_moist (qv, ql, qi, qr, qs, qg, tk, den)
 
 end function wet_bulb_moist
 
-end module module_gfdl_cloud_microphys_v3
+end module gfdl_cloud_microphys_v3_mod
diff --git a/physics/docs/ccpp_doxyfile b/physics/docs/ccpp_doxyfile
@@ -254,7 +254,7 @@ INPUT                  =  pdftxt/mainpage.txt              \
                         ../cnvc90.f \
                         ../module_bfmicrophysics.f \
                         ../gfdl_cloud_microphys.F90 \
-                        ../module_gfdl_cloud_microphys.F90 \
+                        ../gfdl_cloud_microphys_mod.F90 \
                         ../GFS_MP_generic_pre.F90 \
                         ../GFS_MP_generic_post.F90   \
                         ../GFS_PBL_generic_common.F90    \

diff --git a/physics/docs/ccppsrw_doxyfile b/physics/docs/ccppsrw_doxyfile
@@ -254,7 +254,7 @@ INPUT                  =  pdftxt/SRW_mainpage.txt              \
                         ../cnvc90.f \
                         ../module_bfmicrophysics.f \
                         ../gfdl_cloud_microphys.F90 \
-                        ../module_gfdl_cloud_microphys.F90 \
+                        ../gfdl_cloud_microphys_mod.F90 \
                         ../GFS_MP_generic_pre.F90 \
                         ../GFS_MP_generic_post.F90   \
                         ../GFS_PBL_generic_common.F90    \

diff --git a/physics/docs/pdftxt/suite_input.nml.txt b/physics/docs/pdftxt/suite_input.nml.txt
@@ -10,7 +10,7 @@ records \b &gfs_physics_nml. Some schemes have their own namelist records as des
 parameterizations. Its variables are defined in file GFS_typedefs.F90 in the host model.
 
 - Namelist \b &gfdl_cloud_microphysics_nml is only relevant when the GFDL microphysics is used, and its variables are defined in
-module_gfdl_cloud_microphys.F90.
+gfdl_cloud_microphys_mod.F90.
 
 - Namelist \b &cires_ugwp_nml specifies options for the use of CIRES Unified Gravity Wave Physics Version 0.