From ef8a266d6197e41aab19e3d7b810c66869f4073e Mon Sep 17 00:00:00 2001
From: Juan Escobar <juan.escobar@aero.obs-mip.fr>
Date: Wed, 20 Apr 2016 08:49:40 +0000
Subject: [PATCH] Juan 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE.
for PGD files
---
src/MNH/ini_modeln.f90 | 5 +++--
src/MNH/ini_size_spawn.f90 | 11 ++++++-----
src/MNH/mnhclose_aux_io_surf.f90 | 3 ++-
src/MNH/mnhopen_aux_io_surf.f90 | 5 +++--
src/MNH/modeln.f90 | 5 +++--
src/MNH/open_nestpgd_files.f90 | 3 ++-
src/MNH/open_prc_files.f90 | 3 ++-
src/MNH/prep_nest_pgd.f90 | 7 ++++---
src/MNH/spawning.f90 | 3 ++-
9 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index c6ab8f6ab..47e7df0a8 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -264,6 +264,7 @@ END MODULE MODI_INI_MODEL_n
!! Dec 2014 (C.Lac) : For reproducibility START/RESTA
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! V. Masson Feb 2015 replaces, for aerosols, cover fractions by sea, town, bare soil fractions
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!---------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -1879,7 +1880,7 @@ END IF
IF (CSURF=='EXTE' .AND. (CPROGRAM=='MESONH' .OR. CPROGRAM=='DIAG ')) THEN
! ouverture du fichier PGD
IF ( LEN_TRIM(CINIFILEPGD) > 0 ) THEN
- CALL FMOPEN_ll(CINIFILEPGD,'READ',HLUOUT,0,2,NVERB,ININAR,IRESP)
+ CALL FMOPEN_ll(CINIFILEPGD,'READ',HLUOUT,0,2,NVERB,ININAR,IRESP,OPARALLELIO=.FALSE.)
IF (IRESP/=0) THEN
WRITE(ILUOUT,FMT=*) "INI_MODEL_n ERROR TO OPEN THE FILE CINIFILEPGD=",CINIFILEPGD
WRITE(ILUOUT,FMT=*) "CHECK YOUR NAMELIST NAM_LUNITn"
@@ -1918,7 +1919,7 @@ ELSE
END IF
IF (CSURF=='EXTE' .AND. (CPROGRAM=='SPAWN ')) THEN
! ouverture du fichier PGD
- CALL FMOPEN_ll(CINIFILEPGD,'READ',HLUOUT,0,2,NVERB,ININAR,IRESP)
+ CALL FMOPEN_ll(CINIFILEPGD,'READ',HLUOUT,0,2,NVERB,ININAR,IRESP,OPARALLELIO=.FALSE.)
IF (IRESP/=0) THEN
WRITE(ILUOUT,FMT=*) "INI_MODEL_n ERROR TO OPEN THE FILE CINIFILEPGD=",CINIFILEPGD
WRITE(ILUOUT,FMT=*) "CHECK YOUR NAMELIST NAM_LUNIT2_SPA"
diff --git a/src/MNH/ini_size_spawn.f90 b/src/MNH/ini_size_spawn.f90
index 78be2fd64..b0a17124a 100644
--- a/src/MNH/ini_size_spawn.f90
+++ b/src/MNH/ini_size_spawn.f90
@@ -67,7 +67,8 @@ END MODULE MODI_INI_SIZE_SPAWN
!! M.Faivre 2014
!! M.Moge 07/2015 bug fix : files opened multiple times
!! M.Moge 08/2015 bug fix : turning the special case for // case into general case in part 1.4
-!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -268,7 +269,7 @@ IF (LEN_TRIM(CDOMAIN)>0) THEN
! initialize grid2 dims, xor, xend and ratio so to initialize in INI_CHILD
! structures TCRRT_COMDATA%T_CHILDREN%T_SPLITB and TCRRT_PROCONF%T_CHILDREN
!$20140602 add condition on npproc
- CALL FMOPEN_ll(CDOMAIN,'READ',CLUOUT,0,2,NVERB,ININAR,IRESP)
+ CALL FMOPEN_ll(CDOMAIN,'READ',CLUOUT,0,2,NVERB,ININAR,IRESP,OPARALLELIO=.FALSE.)
!
YDIR='--'
CALL FMREAD(CDOMAIN,'DXRATIO',CLUOUT,YDIR,NDXRATIO,IGRID,ILENCH,YCOMMENT,IRESP)
@@ -277,7 +278,7 @@ IF (LEN_TRIM(CDOMAIN)>0) THEN
CALL FMREAD(CDOMAIN,'YOR',CLUOUT,YDIR,NYOR,IGRID,ILENCH,YCOMMENT,IRESP)
CALL FMREAD(CDOMAIN,'IMAX',CLUOUT,YDIR,IIMAX_ll,IGRID,ILENCH,YCOMMENT,IRESP)
CALL FMREAD(CDOMAIN,'JMAX',CLUOUT,YDIR,IJMAX_ll,IGRID,ILENCH,YCOMMENT,IRESP)
- CALL FMCLOS_ll(CDOMAIN,'KEEP',CLUOUT,IRESP)
+ CALL FMCLOS_ll(CDOMAIN,'KEEP',CLUOUT,IRESP,OPARALLELIO=.FALSE.)
NXEND=NXOR+IIMAX_ll/NDXRATIO+2*JPHEXT-1
NYEND=NYOR+IJMAX_ll/NDYRATIO+2*JPHEXT-1
!
@@ -341,9 +342,9 @@ IF (LEN_TRIM(CDOMAIN)>0) THEN
!
!* 1.4 read grid in file CDOMAIN if available :
!
- CALL FMOPEN_ll(CDOMAIN,'READ',CLUOUT,0,2,NVERB,ININAR,IRESP)
+ CALL FMOPEN_ll(CDOMAIN,'READ',CLUOUT,0,2,NVERB,ININAR,IRESP,OPARALLELIO=.FALSE.)
CALL READ_HGRID(2,CDOMAIN,YMY_NAME,YDAD_NAME,YSTORAGE_TYPE)
- CALL FMCLOS_ll(CDOMAIN,'KEEP',CLUOUT,IRESP)
+ CALL FMCLOS_ll(CDOMAIN,'KEEP',CLUOUT,IRESP,OPARALLELIO=.FALSE.)
CALL RETRIEVE1_NEST_INFO_n(1,2,NXOR,NYOR,NXSIZE,NYSIZE,NDXRATIO,NDYRATIO)
DEALLOCATE(XZS,XZSMT,XXHAT,XYHAT)
!
diff --git a/src/MNH/mnhclose_aux_io_surf.f90 b/src/MNH/mnhclose_aux_io_surf.f90
index dcdeac62b..c1f9963aa 100644
--- a/src/MNH/mnhclose_aux_io_surf.f90
+++ b/src/MNH/mnhclose_aux_io_surf.f90
@@ -53,6 +53,7 @@ END MODULE MODI_MNHCLOSE_AUX_IO_SURF
!! MODIFICATIONS
!! -------------
!! Original 09/2003
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -81,7 +82,7 @@ INTEGER :: IRESP ! return-code if a problem appears
!-------------------------------------------------------------------------------
!
IF (CACTION=='OPEN ') THEN
- CALL FMCLOS_ll(HFILE,'KEEP',COUT,IRESP)
+ CALL FMCLOS_ll(HFILE,'KEEP',COUT,IRESP,OPARALLELIO=.FALSE.)
CACTION=' '
END IF
!
diff --git a/src/MNH/mnhopen_aux_io_surf.f90 b/src/MNH/mnhopen_aux_io_surf.f90
index 8186641bc..7999a4e94 100644
--- a/src/MNH/mnhopen_aux_io_surf.f90
+++ b/src/MNH/mnhopen_aux_io_surf.f90
@@ -48,7 +48,8 @@ END MODULE MODI_MNHOPEN_AUX_IO_SURF
!! -------------
!! Original 09/2003
!! M.Moge 04/2015 parallelization og PREP_PGD on son model
-!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -121,7 +122,7 @@ IF (LEN_TRIM(CACTION)>0) THEN
END IF
!
IF (HFILE/=COUTFMFILE .AND. HFILE/=CPGDFILE) THEN
- CALL FMOPEN_ll(HFILE,'READ',COUT,0,2,5,ININAR,IRESP)
+ CALL FMOPEN_ll(HFILE,'READ',COUT,0,2,5,ININAR,IRESP,OPARALLELIO=.FALSE.)
CACTION = 'OPEN '
END IF
!
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index a8fcfa64e..4e8b927ce 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -234,7 +234,8 @@ END MODULE MODI_MODEL_n
!! C.Lac 11/09/2015: correction of the budget due to FIT temporal scheme
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! Sep 2015 (S. Bielli) : Remove YDADFILE from argument call
-! of write_phys_param
+!! of write_phys_param
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -2037,7 +2038,7 @@ IF (OEXIT) THEN
CALL FMCLOS_ll(CFMDIAC,'KEEP',CLUOUT,IRESP)
!
CALL FMCLOS_ll(CINIFILE,'KEEP',CLUOUT,IRESP)
- IF (CSURF=="EXTE") CALL FMCLOS_ll(CINIFILEPGD,'KEEP',CLUOUT,IRESP)
+ IF (CSURF=="EXTE") CALL FMCLOS_ll(CINIFILEPGD,'KEEP',CLUOUT,IRESP,OPARALLELIO=.FALSE.)
!
!* 28.1 print statistics!
!
diff --git a/src/MNH/open_nestpgd_files.f90 b/src/MNH/open_nestpgd_files.f90
index 287583975..7d83dcd40 100644
--- a/src/MNH/open_nestpgd_files.f90
+++ b/src/MNH/open_nestpgd_files.f90
@@ -67,6 +67,7 @@ END MODULE MODI_OPEN_NESTPGD_FILES
!! 11/2015 (M.Moge) disable the creation of files on multiple
!! Z-levels when using parallel IO for PREP_PGD
!! 01/2016 (M.Moge) Bug fix : open the output file using Z-parallel IO
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -314,7 +315,7 @@ CALL CLOSE_ll(HPRE_NEST_PGD)
!
DO JPGD=1,NMODEL
CALL FMOPEN_ll(HPGD(JPGD),'READ',CLUOUT0,0,2,NVERB,ININAR,IRESP,OPARALLELIO=.FALSE.)
- CALL FMOPEN_ll(HNESTPGD(JPGD),'WRITE',CLUOUT0,0,1,NVERB,ININAR,IRESP)
+ CALL FMOPEN_ll(HNESTPGD(JPGD),'WRITE',CLUOUT0,0,1,NVERB,ININAR,IRESP,OPARALLELIO=.FALSE.)
END DO
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/open_prc_files.f90 b/src/MNH/open_prc_files.f90
index 587f257b1..9b9025d8d 100644
--- a/src/MNH/open_prc_files.f90
+++ b/src/MNH/open_prc_files.f90
@@ -88,6 +88,7 @@ END MODULE MODI_OPEN_PRC_FILES
!! (V. Masson)
!! Modification 15/10/01 allow namelists in different orders (I. Mallet)
!! J.ESCOBAR 12/11/2008 Improve checking --> add STATUS=OLD in open_ll(PRE_REAL1.nam,...
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -262,7 +263,7 @@ ELSE
!* 5. OPENNING THE PHYSIOGRAPHIC DATA FILE
! ------------------------------------
!
- CALL FMOPEN_ll(HPGDFILE,'READ',CLUOUT0,0,2,NVERB,ININAR,IRESP)
+ CALL FMOPEN_ll(HPGDFILE,'READ',CLUOUT0,0,2,NVERB,ININAR,IRESP,OPARALLELIO=.FALSE.)
IF (IRESP/=0) THEN
WRITE(ILUOUT0,*) 'STOP: problem during opening of PGD file ',HPGDFILE
!callabortstop
diff --git a/src/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90
index 5393c8ba7..a377c308c 100644
--- a/src/MNH/prep_nest_pgd.f90
+++ b/src/MNH/prep_nest_pgd.f90
@@ -90,7 +90,8 @@
!! 30/07/97 (Masson) split of mode_lfifm_pgd
!! 2014 (M.Faivre)
!! 06/2015 (M.Moge) parallelization
-!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -416,8 +417,8 @@ END DO
! --------------------
!
DO JPGD=1,NMODEL
- CALL FMCLOS_ll(CPGD (JPGD),'KEEP',CLUOUT0,IRESP)
- CALL FMCLOS_ll(CNESTPGD(JPGD),'KEEP',CLUOUT0,IRESP)
+ CALL FMCLOS_ll(CPGD (JPGD),'KEEP',CLUOUT0,IRESP,OPARALLELIO=.FALSE.)
+ CALL FMCLOS_ll(CNESTPGD(JPGD),'KEEP',CLUOUT0,IRESP,OPARALLELIO=.FALSE.)
END DO
!
!* loop to spare enough time to transfer commands before end of program
diff --git a/src/MNH/spawning.f90 b/src/MNH/spawning.f90
index 8840ddea0..c4a50e16f 100644
--- a/src/MNH/spawning.f90
+++ b/src/MNH/spawning.f90
@@ -72,6 +72,7 @@
!! Modification 19/03/2008 (J.Escobar) rename INIT to INIT_MNH --> grib problem
!! Modification 05/02/2015 (M.Moge) read namelist NAM_CONFZ, before INIT_MNH
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -198,7 +199,7 @@ CALL CLOSE_ll(YEXSPA)
CALL INIT_MNH
!
CALL FMCLOS_ll(CINIFILE,'KEEP',CLUOUT,IRESP)
-CALL FMCLOS_ll(CINIFILEPGD,'KEEP',CLUOUT,IRESP)
+CALL FMCLOS_ll(CINIFILEPGD,'KEEP',CLUOUT,IRESP,OPARALLELIO=.FALSE.)
!-------------------------------------------------------------------------------
!
!* 4. INITIALIZATION OF OUTER POINTS OF MODEL 1
--
GitLab