From 8cc7245444fe9e84d3f1f924ba0d8bcafd9a44f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Riette?= <sebastien.riette@meteo.fr>
Date: Fri, 21 Jan 2022 16:17:59 +0100
Subject: [PATCH] =?UTF-8?q?S=C3=A9bastien=2021/01/2022=20MNH/AROME->COMMON?=
=?UTF-8?q?=20compute=5Ffunction=5Fthermo=5Fmf.F90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/arome/gmkpack_ignored_files | 2 +
src/arome/turb/compute_mf_cloud_stat.F90 | 2 +-
.../turb/mode_compute_function_thermo_mf.F90} | 11 +
.../turb/compute_function_thermo_mf.f90 | 238 ------------------
src/mesonh/turb/compute_mf_cloud_stat.f90 | 2 +-
5 files changed, 15 insertions(+), 240 deletions(-)
rename src/{arome/turb/compute_function_thermo_mf.F90 => common/turb/mode_compute_function_thermo_mf.F90} (93%)
delete mode 100644 src/mesonh/turb/compute_function_thermo_mf.f90
diff --git a/src/arome/gmkpack_ignored_files b/src/arome/gmkpack_ignored_files
index 31a2f8772..312b6fcac 100644
--- a/src/arome/gmkpack_ignored_files
+++ b/src/arome/gmkpack_ignored_files
@@ -127,3 +127,5 @@ phyex/turb/th_r_from_thl_rt_3d.F90
phyex/turb/thl_rt_from_th_r_mf.F90
phyex/turb/bl_depth_diag_3d.F90
phyex/turb/bl_depth_diag_1d.F90
+phyex/turb/modi_compute_function_thermo_mf.F90
+phyex/turb/compute_function_thermo_mf.F90
diff --git a/src/arome/turb/compute_mf_cloud_stat.F90 b/src/arome/turb/compute_mf_cloud_stat.F90
index 3c86b33b9..9e33653ef 100644
--- a/src/arome/turb/compute_mf_cloud_stat.F90
+++ b/src/arome/turb/compute_mf_cloud_stat.F90
@@ -46,7 +46,7 @@ USE MODD_CMFSHALL, ONLY : XTAUSIGMF
USE MODD_PARAMETERS, ONLY : JPHEXT, JPVEXT
!
USE MODI_SHUMAN_MF, ONLY: MZF_MF, MZM_MF, GZ_M_W_MF
-USE MODI_COMPUTE_FUNCTION_THERMO_MF
+USE MODE_COMPUTE_FUNCTION_THERMO_MF, ONLY: COMPUTE_FUNCTION_THERMO_MF
!
USE PARKIND1, ONLY : JPRB
USE YOMHOOK , ONLY : LHOOK, DR_HOOK
diff --git a/src/arome/turb/compute_function_thermo_mf.F90 b/src/common/turb/mode_compute_function_thermo_mf.F90
similarity index 93%
rename from src/arome/turb/compute_function_thermo_mf.F90
rename to src/common/turb/mode_compute_function_thermo_mf.F90
index d54c8584a..64cc93462 100644
--- a/src/arome/turb/compute_function_thermo_mf.F90
+++ b/src/common/turb/mode_compute_function_thermo_mf.F90
@@ -1,4 +1,13 @@
+!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
+!MNH_LIC for details. version 1.
! ######spl
+ MODULE MODE_COMPUTE_FUNCTION_THERMO_MF
+! ######################################
+!
+IMPLICIT NONE
+CONTAINS
SUBROUTINE COMPUTE_FUNCTION_THERMO_MF( KRR,KRRL,KRRI, &
PTH, PR, PEXN, PFRAC_ICE, PPABS, &
PT,PAMOIST,PATHETA )
@@ -204,3 +213,5 @@ ELSE
ENDIF
IF (LHOOK) CALL DR_HOOK('COMPUTE_FUNCTION_THERMO_MF',1,ZHOOK_HANDLE)
END SUBROUTINE COMPUTE_FUNCTION_THERMO_MF
+!
+END MODULE MODE_COMPUTE_FUNCTION_THERMO_MF
diff --git a/src/mesonh/turb/compute_function_thermo_mf.f90 b/src/mesonh/turb/compute_function_thermo_mf.f90
deleted file mode 100644
index ae9499c70..000000000
--- a/src/mesonh/turb/compute_function_thermo_mf.f90
+++ /dev/null
@@ -1,238 +0,0 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
-!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
-!MNH_LIC for details. version 1.
-! ######spl
- MODULE MODI_COMPUTE_FUNCTION_THERMO_MF
-! ######################################
-!
-INTERFACE
-
-! #################################################################
- SUBROUTINE COMPUTE_FUNCTION_THERMO_MF( KRR,KRRL,KRRI, &
- PTH, PR, PEXN, PFRAC_ICE, PPABS, &
- PT, PAMOIST,PATHETA )
-! #################################################################
-
-!* 1.1 Declaration of Arguments
-!
-
-INTEGER, INTENT(IN) :: KRR ! number of moist var.
-INTEGER, INTENT(IN) :: KRRL ! number of liquid water var.
-INTEGER, INTENT(IN) :: KRRI ! number of ice water var.
-
-REAL, DIMENSION(:,:), INTENT(IN) :: PTH ! theta
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PR ! water species
-REAL, DIMENSION(:,:) , INTENT(IN) :: PPABS,PEXN ! pressure, Exner funct.
-REAL, DIMENSION(:,:) , INTENT(IN) :: PFRAC_ICE ! ice fraction
-
-REAL, DIMENSION(:,:), INTENT(OUT) :: PT ! temperature
-
-REAL, DIMENSION(:,:), INTENT(OUT) :: PAMOIST,PATHETA
-!
-END SUBROUTINE COMPUTE_FUNCTION_THERMO_MF
-
-END INTERFACE
-!
-END MODULE MODI_COMPUTE_FUNCTION_THERMO_MF
-! ######spl
- SUBROUTINE COMPUTE_FUNCTION_THERMO_MF( KRR,KRRL,KRRI, &
- PTH, PR, PEXN, PFRAC_ICE, PPABS, &
- PT,PAMOIST,PATHETA )
-! #################################################################
-!
-!!
-!!**** *COMPUTE_FUNCTION_THERMO_MF* -
-!!
-!! PURPOSE
-!! -------
-!!
-!!** METHOD
-!! ------
-!!
-!!
-!! EXTERNAL
-!! --------
-!!
-!! IMPLICIT ARGUMENTS
-!! ------------------
-!!
-!!
-!! REFERENCE
-!! ---------
-!!
-!! AUTHOR
-!! ------
-!!
-!! JP Pinty *LA*
-!!
-!! MODIFICATIONS
-!! -------------
-!! Original 24/02/03
-!! Externalisation of computations done in TURB and MF_TURB (Malardel and Pergaud, fev. 2007)
-!! Optimization : V.Masson, 09/2010
-!! S. Riette Sept 2011 : remove of unused PL?OCPEXN, use of received ice fraction
-!!
-!! --------------------------------------------------------------------------
-!
-!* 0. DECLARATIONS
-! ------------
-!
-USE MODD_CST
-!
-IMPLICIT NONE
-!
-!
-!* 0.1 declarations of arguments
-!
-INTEGER, INTENT(IN) :: KRR ! number of moist var.
-INTEGER, INTENT(IN) :: KRRL ! number of liquid water var.
-INTEGER, INTENT(IN) :: KRRI ! number of ice water var.
-
-REAL, DIMENSION(:,:), INTENT(IN) :: PTH ! theta
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PR ! water species
-REAL, DIMENSION(:,:) , INTENT(IN) :: PPABS,PEXN ! pressure, Exner funct.
-REAL, DIMENSION(:,:) , INTENT(IN) :: PFRAC_ICE ! ice fraction
-
-REAL, DIMENSION(:,:), INTENT(OUT) :: PT ! temperature
-
-REAL, DIMENSION(:,:), INTENT(OUT) :: PAMOIST,PATHETA
-!
-!-------------------------------------------------------------------------------
-!
-!* 0.2 Declarations of local variables
-!
-REAL :: ZEPS ! XMV / XMD
-REAL, DIMENSION(SIZE(PTH,1),SIZE(PTH,2)) :: &
- ZCP, & ! Cp
- ZE, & ! Saturation mixing ratio
- ZDEDT, & ! Saturation mixing ratio derivative
- ZAMOIST_W, & ! Coefficients for s = f (Thetal,Rnp)
- ZATHETA_W, & !
- ZAMOIST_I, & !
- ZATHETA_I, & !
- ZLVOCP,ZLSOCP
-
-INTEGER :: JRR
-!
-!-------------------------------------------------------------------------------
-!
-!
- ZEPS = XMV / XMD
-
-!
-!* Cph
-!
-ZCP=XCPD
-
-IF (KRR > 0) ZCP(:,:) = ZCP(:,:) + XCPV * PR(:,:,1)
-
-DO JRR = 2,1+KRRL ! loop on the liquid components
- ZCP(:,:) = ZCP(:,:) + XCL * PR(:,:,JRR)
-END DO
-
-DO JRR = 2+KRRL,1+KRRL+KRRI ! loop on the solid components
- ZCP(:,:) = ZCP(:,:) + XCI * PR(:,:,JRR)
-END DO
-
-!* Temperature
-!
-PT(:,:) = PTH(:,:) * PEXN(:,:)
-!
-!
-!! Liquid water
-!
-IF ( KRRL >= 1 ) THEN
-!
-!* Lv/Cph
-!
- ZLVOCP(:,:) = (XLVTT + (XCPV-XCL) * (PT(:,:)-XTT) ) / ZCP(:,:)
-!
-!* Saturation vapor pressure with respect to water
-!
- ZE(:,:) = EXP( XALPW - XBETAW/PT(:,:) - XGAMW*ALOG( PT(:,:) ) )
-!
-!* Saturation mixing ratio with respect to water
-!
- ZE(:,:) = ZE(:,:) * ZEPS / ( PPABS(:,:) - ZE(:,:) )
-!
-!* Compute the saturation mixing ratio derivative (rvs')
-!
- ZDEDT(:,:) = ( XBETAW / PT(:,:) - XGAMW ) / PT(:,:) &
- * ZE(:,:) * ( 1. + ZE(:,:) / ZEPS )
-!
-!* Compute Amoist
-!
- ZAMOIST_W(:,:)= 0.5 / ( 1.0 + ZDEDT(:,:) * ZLVOCP(:,:) )
-!
-!* Compute Atheta
-!
- ZATHETA_W(:,:)= ZAMOIST_W(:,:) * PEXN(:,:) * &
- ( ( ZE(:,:) - PR(:,:,1) ) * ZLVOCP(:,:) / &
- ( 1. + ZDEDT(:,:) * ZLVOCP(:,:) ) * &
- ( &
- ZE(:,:) * (1. + ZE(:,:)/ZEPS) &
- * ( -2.*XBETAW/PT(:,:) + XGAMW ) / PT(:,:)**2 &
- +ZDEDT(:,:) * (1. + 2. * ZE(:,:)/ZEPS) &
- * ( XBETAW/PT(:,:) - XGAMW ) / PT(:,:) &
- ) &
- - ZDEDT(:,:) &
- )
-
-!
-!! Solid water
-!
- IF ( KRRI >= 1 ) THEN
-
-!
-!* Ls/Cph
-!
- ZLSOCP(:,:) = (XLSTT + (XCPV-XCI) * (PT(:,:)-XTT) ) / ZCP(:,:)
-!
-!* Saturation vapor pressure with respect to ice
-!
- ZE(:,:) = EXP( XALPI - XBETAI/PT(:,:) - XGAMI*ALOG( PT(:,:) ) )
-!
-!* Saturation mixing ratio with respect to ice
-!
- ZE(:,:) = ZE(:,:) * ZEPS / ( PPABS(:,:) - ZE(:,:) )
-!
-!* Compute the saturation mixing ratio derivative (rvs')
-!
- ZDEDT(:,:) = ( XBETAI / PT(:,:) - XGAMI ) / PT(:,:) &
- * ZE(:,:) * ( 1. + ZE(:,:) / ZEPS )
-!
-!* Compute Amoist
-!
- ZAMOIST_I(:,:)= 0.5 / ( 1.0 + ZDEDT(:,:) * ZLSOCP(:,:) )
-!
-!* Compute Atheta
-!
- ZATHETA_I(:,:)= ZAMOIST_I(:,:) * PEXN(:,:) * &
- ( ( ZE(:,:) - PR(:,:,1) ) * ZLSOCP(:,:) / &
- ( 1. + ZDEDT(:,:) * ZLSOCP(:,:) ) * &
- ( &
- ZE(:,:) * (1. + ZE(:,:)/ZEPS) &
- * ( -2.*XBETAI/PT(:,:) + XGAMI ) / PT(:,:)**2 &
- +ZDEDT(:,:) * (1. + 2. * ZE(:,:)/ZEPS) &
- * ( XBETAI/PT(:,:) - XGAMI ) / PT(:,:) &
- ) &
- - ZDEDT(:,:) &
- )
-
- ELSE
- ZAMOIST_I(:,:)=0.
- ZATHETA_I(:,:)=0.
- ENDIF
-
- PAMOIST(:,:) = (1.0-PFRAC_ICE(:,:))*ZAMOIST_W(:,:) &
- +PFRAC_ICE(:,:) *ZAMOIST_I(:,:)
- PATHETA(:,:) = (1.0-PFRAC_ICE(:,:))*ZATHETA_W(:,:) &
- +PFRAC_ICE(:,:) *ZATHETA_I(:,:)
-
-!
-ELSE
- PAMOIST(:,:) = 0.
- PATHETA(:,:) = 0.
-ENDIF
-END SUBROUTINE COMPUTE_FUNCTION_THERMO_MF
diff --git a/src/mesonh/turb/compute_mf_cloud_stat.f90 b/src/mesonh/turb/compute_mf_cloud_stat.f90
index c3c78d467..431052be0 100644
--- a/src/mesonh/turb/compute_mf_cloud_stat.f90
+++ b/src/mesonh/turb/compute_mf_cloud_stat.f90
@@ -92,7 +92,7 @@ USE MODD_PARAM_MFSHALL_n, ONLY : XTAUSIGMF
USE MODD_PARAMETERS, ONLY : JPHEXT, JPVEXT
!
USE MODI_SHUMAN_MF
-USE MODI_COMPUTE_FUNCTION_THERMO_MF
+USE MODE_COMPUTE_FUNCTION_THERMO_MF, ONLY: COMPUTE_FUNCTION_THERMO_MF
!
!
IMPLICIT NONE
--
GitLab