From 6a2b35b093d87c8e5331b0865b1992bc2bbf366a Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 23 Jul 2021 13:22:09 +0200
Subject: [PATCH] Philippe 23/07/2021: replace non-standard FLOAT function by
REAL function
---
src/MNH/eol_alm.f90 | 18 +++++++++---------
src/MNH/ibm_prep_ls.f90 | 4 ++--
src/MNH/lima_adjust.f90 | 5 +++--
src/MNH/lima_adjust_split.f90 | 5 +++--
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/MNH/eol_alm.f90 b/src/MNH/eol_alm.f90
index 6dc910246..ab533254e 100644
--- a/src/MNH/eol_alm.f90
+++ b/src/MNH/eol_alm.f90
@@ -74,7 +74,7 @@ END MODULE MODI_EOL_ALM
!! -------------
!! Original 24/01/17
!! Modification 14/10/20 (PA. Joulin) Updated for a main version
-!!
+! P. Wautelet 23/07/2021: replace non-standard FLOAT function by REAL function
!!---------------------------------------------------------------
!
!
@@ -408,22 +408,22 @@ DO KTSUBCOUNT=1,INBSUBCOUNT
ZFAERO_RG(:) = MATMUL(XMAT_RG_RE(JROT,JBLA,JBELT,:,:), ZFAERO_RE(:))
!
!* 4.11 Adding it to the cell of Meso-NH
- PFX_RG(JI,JJ,JK) = PFX_RG(JI,JJ,JK) + ZFAERO_RG(1) / FLOAT(INBSUBCOUNT)
- PFY_RG(JI,JJ,JK) = PFY_RG(JI,JJ,JK) + ZFAERO_RG(2) / FLOAT(INBSUBCOUNT)
- PFZ_RG(JI,JJ,JK) = PFZ_RG(JI,JJ,JK) + ZFAERO_RG(3) / FLOAT(INBSUBCOUNT)
+ PFX_RG(JI,JJ,JK) = PFX_RG(JI,JJ,JK) + ZFAERO_RG(1) / REAL(INBSUBCOUNT)
+ PFY_RG(JI,JJ,JK) = PFY_RG(JI,JJ,JK) + ZFAERO_RG(2) / REAL(INBSUBCOUNT)
+ PFZ_RG(JI,JJ,JK) = PFZ_RG(JI,JJ,JK) + ZFAERO_RG(3) / REAL(INBSUBCOUNT)
!
!* 4.12 Storing mean values over one full MNH timestep
! (all the sub-timesteps values are averaged)
ZAOA_ATS(JROT,JBLA,JBELT) = ZAOA_ATS(JROT,JBLA,JBELT) &
- + ZAOA / FLOAT(INBSUBCOUNT)
+ + ZAOA / REAL(INBSUBCOUNT)
ZFLIFT_ATS(JROT,JBLA,JBELT) = ZFLIFT_ATS(JROT,JBLA,JBELT) &
- + ZFLIFT / FLOAT(INBSUBCOUNT)
+ + ZFLIFT / REAL(INBSUBCOUNT)
ZFDRAG_ATS(JROT,JBLA,JBELT) = ZFDRAG_ATS(JROT,JBLA,JBELT) &
- + ZFDRAG / FLOAT(INBSUBCOUNT)
+ + ZFDRAG / REAL(INBSUBCOUNT)
ZFAERO_RE_ATS(JROT,JBLA,JBELT,:)= ZFAERO_RE_ATS(JROT,JBLA,JBELT,:) &
- + ZFAERO_RE(:) / FLOAT(INBSUBCOUNT)
+ + ZFAERO_RE(:) / REAL(INBSUBCOUNT)
ZFAERO_RG_ATS(JROT,JBLA,JBELT,:)= ZFAERO_RG_ATS(JROT,JBLA,JBELT,:) &
- + ZFAERO_RG(:) / FLOAT(INBSUBCOUNT)
+ + ZFAERO_RG(:) / REAL(INBSUBCOUNT)
!
! End of position tests
END IF
diff --git a/src/MNH/ibm_prep_ls.f90 b/src/MNH/ibm_prep_ls.f90
index bb3ae049b..f4929d7c3 100644
--- a/src/MNH/ibm_prep_ls.f90
+++ b/src/MNH/ibm_prep_ls.f90
@@ -81,7 +81,7 @@ SUBROUTINE IBM_PREP_LS(OIBM,HIBM_TYPE,PPHI)
! MODIFICATIONS
! -------------
! Original 01/06/2021
- !
+ ! P. Wautelet 23/07/2021: replace non-standard FLOAT function by REAL function
!------------------------------------------------------------------------------
!
!**** 0. DECLARATIONS
@@ -367,7 +367,7 @@ SUBROUTINE IBM_PREP_LS(OIBM,HIBM_TYPE,PPHI)
DO JN=1,IIBM_NUMB_TYPE_SURF
!
READ(UNIT=ILUIBMIDEA,FMT=*) IIBM_TYPE_SURF, IIBM_NUMB_SURF
- ZIBM_TYPE_SURF= float(IIBM_TYPE_SURF)
+ ZIBM_TYPE_SURF= REAL(IIBM_TYPE_SURF)
!
DO JM=1,IIBM_NUMB_SURF
!
diff --git a/src/MNH/lima_adjust.f90 b/src/MNH/lima_adjust.f90
index 949fabf42..31ea1fefa 100644
--- a/src/MNH/lima_adjust.f90
+++ b/src/MNH/lima_adjust.f90
@@ -137,6 +137,7 @@ END MODULE MODI_LIMA_ADJUST
! P. Wautelet 28/05/2020: bugfix: correct array start for PSVT and PSVS
! P. Wautelet 01/02/2021: bugfix: add missing CEDS source terms for SV budgets
! B. Vie 06/2020: fix PSRCS
+! P. Wautelet 23/07/2021: replace non-standard FLOAT function by REAL function
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -694,9 +695,9 @@ IF( IMICRO >= 1 ) THEN
ALLOCATE(ZZW2(IMICRO))
ALLOCATE(ZVEC1(IMICRO))
ALLOCATE(IVEC1(IMICRO))
- ZVEC1(:) = MAX( 1.0001, MIN( FLOAT(NAHEN)-0.0001, XAHENINTP1 * ZZT(:) + XAHENINTP2 ) )
+ ZVEC1(:) = MAX( 1.0001, MIN( REAL(NAHEN)-0.0001, XAHENINTP1 * ZZT(:) + XAHENINTP2 ) )
IVEC1(:) = INT( ZVEC1(:) )
- ZVEC1(:) = ZVEC1(:) - FLOAT( IVEC1(:) )
+ ZVEC1(:) = ZVEC1(:) - REAL( IVEC1(:) )
ZS(:) = ZRVS(:)*PTSTEP / ZRVSATW(:) - 1.
ZZW(:) = ZCCS(:)*PTSTEP/(XLBC*ZCCS(:)/ZRCS(:))**XLBEXC
ZZW2(:) = XAHENG3(IVEC1(:)+1)*ZVEC1(:)-XAHENG3(IVEC1(:))*(ZVEC1(:)-1.)
diff --git a/src/MNH/lima_adjust_split.f90 b/src/MNH/lima_adjust_split.f90
index edaeec820..6f7dbb738 100644
--- a/src/MNH/lima_adjust_split.f90
+++ b/src/MNH/lima_adjust_split.f90
@@ -141,6 +141,7 @@ END MODULE MODI_LIMA_ADJUST_SPLIT
!! MODIFICATIONS
!! -------------
!! Original 06/2021 forked from lima_adjust.f90
+! P. Wautelet 23/07/2021: replace non-standard FLOAT function by REAL function
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -593,9 +594,9 @@ DO JITER =1,ITERMAX
ALLOCATE(ZZW2(IMICRO))
ALLOCATE(ZVEC1(IMICRO))
ALLOCATE(IVEC1(IMICRO))
- ZVEC1(:) = MAX( 1.0001, MIN( FLOAT(NAHEN)-0.0001, XAHENINTP1 * ZZT(:) + XAHENINTP2 ) )
+ ZVEC1(:) = MAX( 1.0001, MIN( REAL(NAHEN)-0.0001, XAHENINTP1 * ZZT(:) + XAHENINTP2 ) )
IVEC1(:) = INT( ZVEC1(:) )
- ZVEC1(:) = ZVEC1(:) - FLOAT( IVEC1(:) )
+ ZVEC1(:) = ZVEC1(:) - REAL( IVEC1(:) )
ZS(:) = ZRVS(:)*PTSTEP / ZRVSATW(:) - 1.
ZZW(:) = ZCCS(:)*PTSTEP/(XLBC*ZCCS(:)/ZRCS(:))**XLBEXC
ZZW2(:) = XAHENG3(IVEC1(:)+1)*ZVEC1(:)-XAHENG3(IVEC1(:))*(ZVEC1(:)-1.)
--
GitLab