From 7a4323de64791bade6e34a713dfc2317c2a524fc Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 9 Nov 2017 15:50:11 +0100
Subject: [PATCH] Philippe 09/11/2017: mppdb: bug correction + minor
improvements
---
src/LIB/SURCOUCHE/src/mode_mppdb.f90 | 2 +-
src/MNH/prep_nest_pgd.f90 | 2 --
src/MNH/prep_pgd.f90 | 1 -
src/MNH/retrieve2_nest_infon.f90 | 5 ++---
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_mppdb.f90 b/src/LIB/SURCOUCHE/src/mode_mppdb.f90
index a77a88a83..49c816ccd 100644
--- a/src/LIB/SURCOUCHE/src/mode_mppdb.f90
+++ b/src/LIB/SURCOUCHE/src/mode_mppdb.f90
@@ -73,7 +73,7 @@ CONTAINS
!NMNH_COMM_WORLD = MPI_COMM_WORLD
- ! If already initialized , no think to do
+ ! If already initialized, nothing to do
IF (MPPDB_INITIALIZED) RETURN
!
MPPDB_INITIALIZED = .TRUE.
diff --git a/src/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90
index de7e03b58..6fe5743a6 100644
--- a/src/MNH/prep_nest_pgd.f90
+++ b/src/MNH/prep_nest_pgd.f90
@@ -171,8 +171,6 @@ TYPE(TPTR2FILE),DIMENSION(:),ALLOCATABLE,TARGET :: TZFILENESTPGD ! Output PGD fi
!
CALL MPPDB_INIT()
!
-CALL MPPDB_INIT()
-!
CALL VERSION
CPROGRAM='NESPGD'
!
diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90
index af766d879..86b617a1e 100644
--- a/src/MNH/prep_pgd.f90
+++ b/src/MNH/prep_pgd.f90
@@ -153,7 +153,6 @@ CPROGRAM='PGD '
!
TZFILE => NULL()
!
-CALL MPPDB_INIT()
!* 1. Set default names and parallelized I/O
! --------------------------------------
!
diff --git a/src/MNH/retrieve2_nest_infon.f90 b/src/MNH/retrieve2_nest_infon.f90
index 4b8b3cc9b..a0caadd91 100644
--- a/src/MNH/retrieve2_nest_infon.f90
+++ b/src/MNH/retrieve2_nest_infon.f90
@@ -261,9 +261,6 @@ IF(.NOT.LCARTESIAN) THEN
XXHAT(JPHEXT+1),XYHAT(JPHEXT+1), &
ZLAT2,ZLON2)
- !20131024 MPPDB CHECK
- CALL MPPDB_CHECK2D(ZPGDLAT1,"retrieve2_nest_info:ZPGDLAT1",PRECISION)
- CALL MPPDB_CHECK2D(ZPGDLON1,"retrieve2_nest_info:ZPGDLON1",PRECISION)
!
!* 1.2 latitude and longitude of all local flux points (model1)
! --------------------------------------------------
@@ -273,6 +270,8 @@ IF(.NOT.LCARTESIAN) THEN
CALL SM_LATLON(XPGDLATOR,XPGDLONOR, &
SPREAD(XPGDXHAT(:),2,IJU),SPREAD(XPGDYHAT(:),1,IIU), &
ZPGDLAT1(:,:),ZPGDLON1(:,:))
+ CALL MPPDB_CHECK2D(ZPGDLAT1,"retrieve2_nest_info:ZPGDLAT1",PRECISION)
+ CALL MPPDB_CHECK2D(ZPGDLON1,"retrieve2_nest_info:ZPGDLON1",PRECISION)
ENDIF
!
!* 1.3 KXOR_C_ll, KYOR_C_ll - origin (global) of son model in father grid
--
GitLab