make progsigma_calc a module so it can be used referenced by several …

…convection schemes
ufs-community · Apr 7, 2023 · fd4eaf3 · fd4eaf3
1 parent 59c64cd
commit fd4eaf3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 3 deletions.
diff --git a/physics/cu_unified_deep.F90 b/physics/cu_unified_deep.F90
@@ -3,6 +3,7 @@
 
 module cu_unified_deep
      use machine , only : kind_phys
+     use progsigma, only : progsigma_calc
 
      real(kind=kind_phys), parameter::g=9.81
      real(kind=kind_phys), parameter:: cp=1004.

diff --git a/physics/cu_unified_driver.F90 b/physics/cu_unified_driver.F90
@@ -9,12 +9,13 @@ module cu_unified_driver
    use machine   , only: kind_phys
    use cu_unified_deep, only: cu_unified_deep_run,neg_check,fct1d3
    use cu_unified_sh  , only: cu_unified_sh_run
+   use progsigma      , only: progsigma_calc
 
    implicit none
 
    private
 
-   public :: cu_unified_driver_init, cu_unified_driver_run
+   public :: cu_unified_driver_init, cu_unified_driver_run, progsigma_calc
 
 contains
 

diff --git a/physics/cu_unified_driver.meta b/physics/cu_unified_driver.meta
@@ -1,7 +1,7 @@
 [ccpp-table-properties]
   name = cu_unified_driver
   type = scheme
-  dependencies = cu_unified_deep.F90,cu_unified_sh.F90,machine.F,physcons.F90
+  dependencies = cu_unified_deep.F90,cu_unified_sh.F90,machine.F,physcons.F90,progsigma_calc.f90
 
 ########################################################################
 [ccpp-arg-table]

diff --git a/physics/cu_unified_sh.F90 b/physics/cu_unified_sh.F90
@@ -3,6 +3,8 @@
 
 module cu_unified_sh
     use machine , only : kind_phys
+    use progsigma, only : progsigma_calc
+
     !real(kind=kind_phys), parameter:: c1_shal=0.0015! .0005
     real(kind=kind_phys), parameter:: c1_shal=0. !0.005! .0005
     real(kind=kind_phys), parameter:: g  =9.81

diff --git a/physics/progsigma_calc.f90 b/physics/progsigma_calc.f90
@@ -1,3 +1,11 @@
+      module progsigma
+
+        implicit none
+
+        public progsigma_calc
+
+      contains
+
 !>\file progsigma_calc.f90
 !! This file contains the subroutine that calculates the prognostic
 !! updraft area fraction that is used for closure computations in 
@@ -211,3 +219,5 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,           &
       endif
 
      end subroutine progsigma_calc
+
+end module progsigma
diff --git a/physics/samfdeepcnv.f b/physics/samfdeepcnv.f
@@ -7,7 +7,8 @@
       module samfdeepcnv
 
       use samfcnv_aerosols, only : samfdeepcnv_aerosols
-
+      use progsigma, only : progsigma_calc
+
       contains
 
       subroutine samfdeepcnv_init(imfdeepcnv,imfdeepcnv_samf,            &

diff --git a/physics/samfshalcnv.f b/physics/samfshalcnv.f
@@ -4,6 +4,7 @@
       module samfshalcnv
 
       use samfcnv_aerosols, only : samfshalcnv_aerosols
+      use progsigma, only : progsigma_calc
 
       contains