From 45b2ff402619ef71432fe5255ee80274e3cbc822 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 15 Mar 2019 16:05:50 +0100
Subject: [PATCH] Philippe 15/03/2019: use MNHREAL from modd_precision
---
src/MNH/bl89.f90 | 10 +++-------
src/MNH/ini_cst.f90 | 23 +++++++++++++----------
src/MNH/mode_RBK90_Integrator.f90 | 7 ++-----
3 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/MNH/bl89.f90 b/src/MNH/bl89.f90
index 6835f4492..860afcf79 100644
--- a/src/MNH/bl89.f90
+++ b/src/MNH/bl89.f90
@@ -81,6 +81,7 @@ USE MODD_CONF, ONLY: CPROGRAM
USE MODD_CST
USE MODD_CTURB
USE MODD_PARAMETERS
+use modd_precision, only: MNHREAL
!
!
IMPLICIT NONE
@@ -347,13 +348,8 @@ DO JK=IKTB,IKTE
!* 7. final mixing length
!
DO J1D=1,IIU*IJU
-#if (MNH_REAL == 8)
- ZLWORK1=MAX(ZLMDN(J1D,JK),1.E-10)
- ZLWORK2=MAX(ZLWORK(J1D),1.E-10)
-#else
- ZLWORK1=MAX(ZLMDN(J1D,JK),1.D-10)
- ZLWORK2=MAX(ZLWORK(J1D),1.D-10)
-#endif
+ ZLWORK1=MAX(ZLMDN(J1D,JK),1.E-10_MNHREAL)
+ ZLWORK2=MAX(ZLWORK(J1D),1.E-10_MNHREAL)
ZPOTE = ZLWORK1 / ZLWORK2
ZLWORK2=1.d0 + ZPOTE**(2./3.)
ZLM(J1D,JK) = Z2SQRT2*ZLWORK1/(ZLWORK2*SQRT(ZLWORK2))
diff --git a/src/MNH/ini_cst.f90 b/src/MNH/ini_cst.f90
index 9fd09be3a..91526bed4 100644
--- a/src/MNH/ini_cst.f90
+++ b/src/MNH/ini_cst.f90
@@ -71,6 +71,7 @@ END MODULE MODI_INI_CST
! ------------
!
USE MODD_CST
+use modd_precision, only: MNHREAL
!
IMPLICIT NONE
!
@@ -160,17 +161,19 @@ XMNH_HUGE = HUGE (XMNH_HUGE )
XMNH_HUGE_12_LOG = LOG ( SQRT(XMNH_HUGE) )
#if (MNH_REAL == 8)
-XMNH_TINY = 1.0e-80
-XEPS_DT = 1.0e-5
-XRES_FLAT_CART = 1.0e-12
-XRES_OTHER = 1.0e-9
-XRES_PREP = 1.0e-8
-#else
+XMNH_TINY = 1.0e-80_MNHREAL
+XEPS_DT = 1.0e-5_MNHREAL
+XRES_FLAT_CART = 1.0e-12_MNHREAL
+XRES_OTHER = 1.0e-9_MNHREAL
+XRES_PREP = 1.0e-8_MNHREAL
+#elif (MNH_REAL == 4)
XMNH_TINY = TINY (XMNH_TINY )
-XEPS_DT = 1.5e-4
-XRES_FLAT_CART = 1.0e-12
-XRES_OTHER = 1.0e-7
-XRES_PREP = 1.0e-4
+XEPS_DT = 1.5e-4_MNHREAL
+XRES_FLAT_CART = 1.0e-12_MNHREAL
+XRES_OTHER = 1.0e-7_MNHREAL
+XRES_PREP = 1.0e-4_MNHREAL
+#else
+#error "Invalid MNH_REAL"
#endif
XMNH_TINY_12 = SQRT (XMNH_TINY )
diff --git a/src/MNH/mode_RBK90_Integrator.f90 b/src/MNH/mode_RBK90_Integrator.f90
index f1e50b243..ae11720e3 100644
--- a/src/MNH/mode_RBK90_Integrator.f90
+++ b/src/MNH/mode_RBK90_Integrator.f90
@@ -61,6 +61,7 @@ MODULE MODE_RBK90_Integrator
USE MODD_RBK90_JacobianSP_n, ONLY: LU_DIM_SPECIES
USE MODD_RBK90_Parameters_n, ONLY: NVAR
USE MODD_RBK90_Global_n, ONLY: STEPMIN
+ use modd_precision, only: MNHREAL
IMPLICIT NONE
PUBLIC
SAVE
@@ -737,11 +738,7 @@ Stage: DO istage = 1, ros_S
END DO
Err = SQRT(Err/N)
-#if (MNH_REAL == 8)
- ros_ErrorNorm = MAX(Err,1.0e-10)
-#else
- ros_ErrorNorm = MAX(Err,1.0d-10)
-#endif
+ ros_ErrorNorm = MAX(Err,1.0e-10_MNHREAL)
END FUNCTION ros_ErrorNorm
--
GitLab