From c4092c303d325d65e3497323c422493f26e6d53d Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Mon, 11 Jul 2016 15:11:52 +0200
Subject: [PATCH] Philippe 11/07/2016: removed MNH_NCWRIT keyword. Some files
with it are still available as they could be useful later.
---
conf/profile_mesonh.ihm | 4 -
src/LIB/SURCOUCHE/src/fmwrit_ll.f90 | 737 -------------------------
src/MNH/diag.f90 | 96 +---
src/MNH/modd_ncout.f90 | 42 --
src/MNH/modeln.f90 | 142 +----
src/MNH/modn_ncout.f90 | 44 --
src/MNH/open_nestpgd_files.f90 | 8 +-
src/MNH/prep_ideal_case.f90 | 37 +-
src/MNH/prep_nest_pgd.f90 | 25 +-
src/MNH/prep_pgd.f90 | 79 +--
src/MNH/prep_real_case.f90 | 30 +-
src/MNH/prep_surf_mnh.f90 | 21 +-
src/MNH/read_exsegn.f90 | 12 +-
src/MNH/read_exspa.f90 | 10 +-
src/MNH/spawn_model2.f90 | 15 +-
src/MNH/spawn_surf.f90 | 31 +-
src/MNH/write_lfifm1_for_diag_supp.f90 | 36 +-
src/MNH/write_lfifmn_fordiachron.f90 | 39 +-
src/MNH/write_lfin.f90 | 45 +-
src/MNH/write_seriesn.f90 | 17 +-
src/MNH/zoom_pgd.f90 | 8 +-
src/Makefile.MESONH.mk | 6 -
22 files changed, 69 insertions(+), 1415 deletions(-)
delete mode 100644 src/MNH/modd_ncout.f90
delete mode 100644 src/MNH/modn_ncout.f90
diff --git a/conf/profile_mesonh.ihm b/conf/profile_mesonh.ihm
index 48af993f5..2042c6e41 100755
--- a/conf/profile_mesonh.ihm
+++ b/conf/profile_mesonh.ihm
@@ -59,10 +59,6 @@ export OPTLEVEL=${OPTLEVEL}
#
export VER_USER=${VER_USER}
#
-# NETCDF OUTPUT
-#
-export MNH_NCWRIT=${MNH_NCWRIT}
-#
# 'Scandollar' Post Processing default variables
#
export CONF_DOLLAR=${CONF_DOLLAR}
diff --git a/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 b/src/LIB/SURCOUCHE/src/fmwrit_ll.f90
index 70025f66f..7d331e1ad 100644
--- a/src/LIB/SURCOUCHE/src/fmwrit_ll.f90
+++ b/src/LIB/SURCOUCHE/src/fmwrit_ll.f90
@@ -236,12 +236,6 @@ CONTAINS
USE MODD_IO_ll, ONLY : ISP,GSMONOPROC,LIOCDF4,LLFIOUT
USE MODD_FM
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
-#ifdef MNH_NCWRIT
- USE MODD_GRID
- USE MODD_DIM_n, ONLY: NIMAX
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
!
!* 0. DECLARATIONS
! ------------
@@ -285,59 +279,15 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,1,PFIELD,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NIMAX == 0 ) THEN
-! PRINT * , ' SAVE MAP PARAMETER IF PGD '
- IF ( trim(hrecfm) == "RPK" ) THEN
- XRPK=PFIELD
- ELSEIF ( trim(hrecfm) == "BETA" ) THEN
- XBETA=PFIELD
- ELSEIF (trim(hrecfm) == "LATORI" ) THEN
- XLATORI=PFIELD
- ELSEIF (trim(hrecfm) == "LONORI" ) THEN
- XLONORI=PFIELD
- ELSEIF (trim(hrecfm) == "LAT0" ) THEN
- XLAT0=PFIELD
- ELSEIF (trim(hrecfm) == "LON0" ) THEN
- XLON0=PFIELD
- END IF
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,1,PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
ELSE
IF (ISP == TZFD%OWNER) THEN
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,1,PFIELD,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NIMAX == 0 ) THEN
-! print * , ' SAVE MAP PARAMETER IF PGD '
- IF ( trim(hrecfm) == "RPK" ) THEN
- XRPK=PFIELD
- ELSEIF ( trim(hrecfm) == "BETA" ) THEN
- XBETA=PFIELD
- ELSEIF (trim(hrecfm) == "LATORI" ) THEN
- XLATORI=PFIELD
- ELSEIF (trim(hrecfm) == "LONORI" ) THEN
- XLONORI=PFIELD
- ELSEIF (trim(hrecfm) == "LAT0" ) THEN
- XLAT0=PFIELD
- ELSEIF (trim(hrecfm) == "LON0" ) THEN
- XLON0=PFIELD
- END IF
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,1,PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -353,14 +303,8 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD_IOZ%FLU,HRECFM,.TRUE.,1,PFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD_IOZ%FLU,HRECFM,.TRUE.,1,PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD_IOZ%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
END IF
END DO
ENDIF
@@ -381,12 +325,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
USE MODE_ALLOCBUFFER_ll
USE MODE_GATHER_ll
-#ifdef MNH_NCWRIT
- USE MODE_UTIL
- USE MODE_DIMLIST
- USE MODD_DIM_n, ONLY: NIMAX
- USE MODD_NCOUT
-#endif
!
!* 0. DECLARATIONS
! ------------
@@ -413,21 +351,12 @@ CONTAINS
TYPE(FMHEADER) :: TZFMH
REAL,DIMENSION(:),POINTER :: ZFIELDP
LOGICAL :: GALLOC
-#ifdef MNH_NCWRIT
- TYPE(workfield), DIMENSION(:), POINTER :: TZRECLIST
- INTEGER,DIMENSION(6) :: TABDIM
-#endif
!
!* 1.1 THE NAME OF LFIFM
!
IRESP = 0
GALLOC = .FALSE.
YFNLFI=TRIM(ADJUSTL(HFILEM))//'.lfi'
-#ifdef MNH_NCWRIT
- TABDIM(:)=1
- TABDIM(1)=SIZE(PFIELD,1)
- !print * , ' Writing Article 1 ' , HRECFM
-#endif
!------------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
IF (ASSOCIATED(TZFD)) THEN
@@ -435,25 +364,8 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
- ! ------- WRITE NETCDF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,PFIELD,.TRUE.,TZRECLIST, &
-! CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,PFIELD, &
- & KLENCH,HCOMMENT)
- IF ( NC_FILE == 'phy' ) THEN
-!!!!! CAS WRITE_PHYS_PARAM ... l'ecriture lfi ne peut pas se faire en meme temps
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE., &
- SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
ELSE
IF (ISP == TZFD%OWNER) THEN
CALL ALLOCBUFFER_ll(ZFIELDP,PFIELD,HDIR,GALLOC)
@@ -470,25 +382,9 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- TABDIM(1)=SIZE(ZFIELDP,1)
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST, &
- & KLENCH,HCOMMENT)
- IF ( NC_FILE == 'phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -516,12 +412,6 @@ CONTAINS
USE MODD_TIMEZ, ONLY : TIMEZ
USE MODE_MNH_TIMING, ONLY : SECOND_MNH2
!JUANZ
-#ifdef MNH_NCWRIT
- USE MODE_UTIL
- USE MODE_DIMLIST
- USE MODD_DIM_n, ONLY: NIMAX
- USE MODD_NCOUT
-#endif
#ifdef MNH_GA
!JUAN_IOGA
USE MODE_GA
@@ -550,12 +440,6 @@ CONTAINS
REAL,DIMENSION(:,:),POINTER :: ZFIELDP
TYPE(FMHEADER) :: TZFMH
LOGICAL :: GALLOC
-#ifdef MNH_NCWRIT
- TYPE(workfield), DIMENSION(:), POINTER :: TZRECLIST
- INTEGER,DIMENSION(6) :: TABDIM
- LOGICAL :: NCWR
- INTEGER :: LHREC_BEG,LHRECFM
-#endif
!
!JUANZ
REAL*8,DIMENSION(2) :: T0,T1,T2
@@ -574,13 +458,6 @@ CONTAINS
IRESP = 0
GALLOC = .FALSE.
YFNLFI=TRIM(ADJUSTL(HFILEM))//'.lfi'
-#ifdef MNH_NCWRIT
- NCWR=.TRUE.
- TABDIM(:)=1
- TABDIM(1)=SIZE(PFIELD,1)
- TABDIM(2)=SIZE(PFIELD,2)
- !print * , ' Writing Article 2 ' , HRECFM
-#endif
!------------------------------------------------------------------
IHEXTOT = 2*JPHEXT+1
TZFD=>GETFD(YFNLFI)
@@ -592,75 +469,16 @@ CONTAINS
! IF (LPACK .AND. L1D .AND. HDIR=='XY') THEN
IF (LPACK .AND. L1D .AND. SIZE(PFIELD,1)==IHEXTOT .AND. SIZE(PFIELD,2)==IHEXTOT) THEN
ZFIELDP=>PFIELD(JPHEXT+1:JPHEXT+1,JPHEXT+1:JPHEXT+1)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- TABDIM(1)=1
- TABDIM(2)=1
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST,&
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
! ELSE IF (LPACK .AND. L2D .AND. HDIR=='XY') THEN
ELSEIF (LPACK .AND. L2D .AND. SIZE(PFIELD,2)==IHEXTOT) THEN
ZFIELDP=>PFIELD(:,JPHEXT+1:JPHEXT+1)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
- LHRECFM = LEN_TRIM(ADJUSTL(HRECFM))
- IF ( LHRECFM > 5 ) THEN
- LHREC_BEG =LHRECFM-4
- IF ( ADJUSTL(HRECFM(LHREC_BEG:LHRECFM)) == 'DATIM') THEN
- NCWR = .FALSE.
- END IF
- END IF
- IF ( LNETCDF .AND. NC_WRITE .AND. NCWR ) THEN
- TABDIM(2)=1
- IF ( NC_FILE == 'phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE., &
- SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST,&
- & KLENCH,HCOMMENT)
- END IF
- NCWR = .TRUE.
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
ELSE
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
- LHRECFM = LEN_TRIM(ADJUSTL(HRECFM))
- IF ( LHRECFM > 5 ) THEN
- LHREC_BEG =LHRECFM-4
- IF ( ADJUSTL(HRECFM(LHREC_BEG:LHRECFM)) == 'DATIM') THEN
- NCWR = .FALSE.
- END IF
- END IF
-! IF ( NIMAX /= 0 ) THEN
- IF ( LNETCDF .AND. NC_WRITE .AND. NCWR ) THEN
- IF ( NC_FILE == 'phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE., &
- SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,PFIELD,.TRUE.,TZRECLIST, &
- & KLENCH,HCOMMENT)
- END IF
- NCWR = .TRUE.
-! END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
END IF
ELSE ! multiprocessor execution
CALL SECOND_MNH2(T0)
@@ -725,31 +543,9 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
- LHRECFM = LEN_TRIM(ADJUSTL(HRECFM))
- IF ( LHRECFM > 5 ) THEN
- LHREC_BEG =LHRECFM-4
- IF ( ADJUSTL(HRECFM(LHREC_BEG:LHRECFM)) == 'DATIM') THEN
- NCWR = .FALSE.
- END IF
- END IF
- IF ( LNETCDF .AND. NC_WRITE .AND. NCWR ) THEN
- TABDIM(1)=SIZE(ZFIELDP,1)
- TABDIM(2)=SIZE(ZFIELDP,2)
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST, &
-! CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP, &
- & KLENCH,HCOMMENT)
- END IF
- NCWR=.TRUE.
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
END IF
#ifdef MNH_GA
!!$ IF (ISP .EQ. 1 ) THEN
@@ -793,11 +589,6 @@ CONTAINS
USE MODD_TIMEZ, ONLY : TIMEZ
USE MODE_MNH_TIMING, ONLY : SECOND_MNH2
!JUANZ
-#ifdef MNH_NCWRIT
- USE MODE_UTIL
- USE MODD_DIM_n, ONLY: NIMAX
- USE MODD_NCOUT
-#endif
#ifdef MNH_GA
USE MODE_GA
#endif
@@ -850,12 +641,6 @@ CONTAINS
REAL*8,DIMENSION(2) :: T11,T22
!JUANZIO
!JUAN
-#ifdef MNH_NCWRIT
- TYPE(workfield), DIMENSION(:), POINTER :: TZRECLIST
- INTEGER,DIMENSION(6) :: TABDIM
- CHARACTER(LEN=LEN(HRECFM)) :: HRECT
- INTEGER :: LHRECT
-#endif
#ifdef MNH_GA
REAL,DIMENSION(:,:,:),POINTER :: ZFIELD_GA
#endif
@@ -870,30 +655,6 @@ CONTAINS
YFNLFI=TRIM(ADJUSTL(HFILEM))//'.lfi'
!print * , ' Writing Article 3 ' , HRECFM
!
-#ifdef MNH_NCWRIT
- HRECT=TRIM(HRECFM)
- LHRECT=LEN(TRIM(HRECT))
- TABDIM(:)=1
- TABDIM(1)=SIZE(PFIELD,1)
- TABDIM(2)=SIZE(PFIELD,2)
- TABDIM(3)=SIZE(PFIELD,3)
- IF ( LHRECT .gt. 4 ) THEN
- IF ( HRECT(LHRECT-4:LHRECT) == 'TRAJZ' ) THEN
- TABDIM(3)=SIZE(PFIELD,1)
- TABDIM(1)=1
- END IF
- END IF
- IF ( TRIM(HRECFM) == 'AVION.TRAJX' ) THEN
- TABDIM(1)=SIZE(PFIELD,2)
- TABDIM(2)=1
- ELSEIF ( TRIM(HRECFM) == 'AVION.TRAJY' ) THEN
- TABDIM(1)=SIZE(PFIELD,2)
- TABDIM(2)=1
- ELSEIF ( TRIM(HRECFM) == 'AVION.TRAJZ' ) THEN
- TABDIM(1)=SIZE(PFIELD,2)
- TABDIM(2)=1
- END IF
-#endif
!------------------------------------------------------------------
IHEXTOT = 2*JPHEXT+1
TZFD=>GETFD(YFNLFI)
@@ -905,57 +666,16 @@ CONTAINS
! IF (LPACK .AND. L1D .AND. HDIR=='XY') THEN
IF (LPACK .AND. L1D .AND. SIZE(PFIELD,1)==IHEXTOT .AND. SIZE(PFIELD,2)==IHEXTOT) THEN
ZFIELDP=>PFIELD(JPHEXT+1:JPHEXT+1,JPHEXT+1:JPHEXT+1,:)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- TABDIM(1)=1
- TABDIM(2)=1
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST, &
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
! ELSE IF (LPACK .AND. L2D .AND. HDIR=='XY') THEN
ELSEIF (LPACK .AND. L2D .AND. SIZE(PFIELD,2)==IHEXTOT) THEN
ZFIELDP=>PFIELD(:,JPHEXT+1:JPHEXT+1,:)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- TABDIM(2)=1
- IF ( NC_FILE == 'phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST, &
-! CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP, &
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
ELSE
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- IF ( NC_FILE == 'phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,PFIELD,.TRUE.,TZRECLIST, &
-! CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,PFIELD, &
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
END IF
ELSEIF ( (TZFD%nb_procio .eq. 1 ) .OR. ( HDIR == '--' ) ) THEN ! multiprocessor execution & 1 proc IO
! write 3D field in 1 time = output for graphique
@@ -980,28 +700,9 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- TABDIM(1)=SIZE(ZFIELDP,1)
- TABDIM(2)=SIZE(ZFIELDP,2)
- TABDIM(3)=SIZE(ZFIELDP,3)
- IF ( NC_FILE == ' phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST, &
-! CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP, &
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD&
@@ -1244,12 +945,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
USE MODE_ALLOCBUFFER_ll
USE MODE_GATHER_ll
-!!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!!! MOD SB
!
!
!* 0.1 Declarations of arguments
@@ -1292,34 +987,16 @@ CONTAINS
! IF (LPACK .AND. L1D .AND. HDIR=='XY') THEN
IF (LPACK .AND. L1D .AND. SIZE(PFIELD,1)==IHEXTOT .AND. SIZE(PFIELD,2)==IHEXTOT) THEN
ZFIELDP=>PFIELD(JPHEXT+1:JPHEXT+1,JPHEXT+1:JPHEXT+1,:,:)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
! ELSE IF (LPACK .AND. L2D .AND. HDIR=='XY') THEN
ELSEIF (LPACK .AND. L2D .AND. SIZE(PFIELD,2)==IHEXTOT) THEN
ZFIELDP=>PFIELD(:,JPHEXT+1:JPHEXT+1,:,:)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
ELSE
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
END IF
ELSE
IF (ISP == TZFD%OWNER) THEN
@@ -1343,14 +1020,8 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -1374,11 +1045,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
USE MODE_ALLOCBUFFER_ll
USE MODE_GATHER_ll
-#ifdef MNH_NCWRIT
- USE MODE_UTIL
- USE MODD_DIM_n
- USE MODD_NCOUT
-#endif
!
!
!* 0.1 Declarations of arguments
@@ -1402,10 +1068,6 @@ CONTAINS
REAL,DIMENSION(:,:,:,:,:),POINTER :: ZFIELDP
TYPE(FMHEADER) :: TZFMH
LOGICAL :: GALLOC
-#ifdef MNH_NCWRIT
- TYPE(workfield), DIMENSION(:), POINTER :: TZRECLIST
- INTEGER,DIMENSION(6) :: TABDIM
-#endif
INTEGER :: IHEXTOT
!
!* 1.1 THE NAME OF LFIFM
@@ -1413,15 +1075,6 @@ CONTAINS
IRESP = 0
GALLOC = .FALSE.
YFNLFI=TRIM(ADJUSTL(HFILEM))//'.lfi'
-#ifdef MNH_NCWRIT
- TABDIM(:)=1
- TABDIM(1)=SIZE(PFIELD,1)
- TABDIM(2)=SIZE(PFIELD,2)
- TABDIM(3)=SIZE(PFIELD,3)
- TABDIM(4)=SIZE(PFIELD,4)
- TABDIM(5)=SIZE(PFIELD,5)
- !print * , ' Writing Article 5 ' , HRECFM
-#endif
!------------------------------------------------------------------
IHEXTOT = 2*JPHEXT+1
TZFD=>GETFD(YFNLFI)
@@ -1433,53 +1086,16 @@ CONTAINS
! IF (LPACK .AND. L1D .AND. HDIR=='XY') THEN
IF (LPACK .AND. L1D .AND. SIZE(PFIELD,1)==IHEXTOT .AND. SIZE(PFIELD,2)==IHEXTOT) THEN
ZFIELDP=>PFIELD(JPHEXT+1:JPHEXT+1,JPHEXT+1:JPHEXT+1,:,:,:)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
! ELSE IF (LPACK .AND. L2D .AND. HDIR=='XY') THEN
ELSEIF (LPACK .AND. L2D .AND. SIZE(PFIELD,2)==IHEXTOT) THEN
ZFIELDP=>PFIELD(:,JPHEXT+1:JPHEXT+1,:,:,:)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- TABDIM(2)=1
- IF ( NC_FILE == 'phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP), &
- ZFIELDP,TZFMH,IRESP)
- END IF
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST, &
-! CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP, &
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
ELSE
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- IF ( NC_FILE == 'phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD), &
- PFIELD,TZFMH,IRESP)
- END IF
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,PFIELD,.TRUE.,TZRECLIST, &
-! CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,PFIELD, &
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
END IF
ELSE
IF (ISP == TZFD%OWNER) THEN
@@ -1504,25 +1120,9 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- IF ( NC_FILE == 'phy' ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP,.TRUE.,TZRECLIST, &
-! CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,ZFIELDP, &
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -1546,12 +1146,6 @@ CONTAINS
USE MODE_ALLOCBUFFER_ll
USE MODE_GATHER_ll
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -1588,14 +1182,8 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PFIELD),PFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,PFIELD,TZFMH,IRESP)
-#endif
ELSE ! multiprocessor execution
IF (ISP == TZFD%OWNER) THEN
CALL ALLOCBUFFER_ll(ZFIELDP,PFIELD,HDIR,GALLOC)
@@ -1614,16 +1202,9 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -1646,12 +1227,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
!* 0. DECLARATIONS
! ------------
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!
!* 0.1 Declarations of arguments
@@ -1694,27 +1269,15 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,1,KFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,1,KFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,KFIELD,TZFMH,IRESP)
-#endif
ELSE
IF (ISP == TZFD%OWNER) THEN
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,1,KFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,1,KFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,KFIELD,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -1731,14 +1294,8 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD_IOZ%FLU,HRECFM,.FALSE.,1,KFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD_IOZ%FLU,HRECFM,.FALSE.,1,KFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD_IOZ%CDF,HRECFM,HDIR,KFIELD,TZFMH,IRESP)
-#endif
END IF
END DO
ENDIF
@@ -1762,12 +1319,6 @@ CONTAINS
USE MODE_GATHER_ll
!* 0. DECLARATIONS
! ------------
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!
!* 0.1 Declarations of arguments
@@ -1791,11 +1342,6 @@ CONTAINS
TYPE(FMHEADER) :: TZFMH
INTEGER,DIMENSION(:),POINTER :: IFIELDP
LOGICAL :: GALLOC
-#ifdef MNH_NCWRIT
- REAL,DIMENSION(SIZE(KFIELD)) ::WFIELD
- TYPE(workfield), DIMENSION(:), POINTER :: TZRECLIST
- INTEGER,DIMENSION(6) :: TABDIM
-#endif
!----------------------------------------------------------------
!
!* 1.1 THE NAME OF LFIFM
@@ -1804,10 +1350,6 @@ CONTAINS
GALLOC = .FALSE.
YFNLFI=TRIM(ADJUSTL(HFILEM))//'.lfi'
!print * , ' Writing Article N1 ' , HRECFM
-#ifdef MNH_NCWRIT
- WFIELD = KFIELD
- TABDIM(:)=1
-#endif
!------------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
IF (ASSOCIATED(TZFD)) THEN
@@ -1815,18 +1357,8 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(KFIELD),KFIELD,TZFMH,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,WFIELD, &
- & .TRUE.,TZRECLIST,KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(KFIELD),KFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,KFIELD,TZFMH,IRESP)
-#endif
ELSE
IF (ISP == TZFD%OWNER) THEN
CALL ALLOCBUFFER_ll(IFIELDP,KFIELD,HDIR,GALLOC)
@@ -1843,21 +1375,9 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELDP),IFIELDP,TZFMH&
- & ,IRESP)
- END IF
- IF ( LNETCDF .AND. NC_WRITE ) THEN
- CALL NC_WRIT_ll(HRECFM,HFILEM,KGRID,TABDIM,WFIELD, &
- .TRUE.,TZRECLIST,&
- & KLENCH,HCOMMENT)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELDP),IFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,IFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -1883,12 +1403,6 @@ CONTAINS
USE MODE_ALLOCBUFFER_ll
USE MODE_GATHER_ll
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -1922,7 +1436,6 @@ CONTAINS
!
IHEXTOT = 2*JPHEXT+1
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID=KGRID
@@ -1931,34 +1444,16 @@ CONTAINS
! IF (LPACK .AND. L1D .AND. HDIR=='XY') THEN
IF (LPACK .AND. L1D .AND. SIZE(KFIELD,1)==IHEXTOT .AND. SIZE(KFIELD,2)==IHEXTOT) THEN
IFIELDP=>KFIELD(JPHEXT+1:JPHEXT+1,JPHEXT+1:JPHEXT+1)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELDP),IFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELDP),IFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,IFIELDP,TZFMH,IRESP)
-#endif
! ELSE IF (LPACK .AND. L2D .AND. HDIR=='XY') THEN
ELSEIF (LPACK .AND. L2D .AND. SIZE(KFIELD,2)==IHEXTOT) THEN
IFIELDP=>KFIELD(:,JPHEXT+1:JPHEXT+1)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELDP),IFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELDP),IFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,IFIELDP,TZFMH,IRESP)
-#endif
ELSE
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(KFIELD),KFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(KFIELD),KFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,KFIELD,TZFMH,IRESP)
-#endif
END IF
ELSE
IF (ISP == TZFD%OWNER) THEN
@@ -1982,16 +1477,9 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELDP),IFIELDP,TZFMH&
- & ,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELDP),IFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,IFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -2015,12 +1503,6 @@ CONTAINS
USE MODD_FM
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0. DECLARATIONS
! ------------
@@ -2061,33 +1543,20 @@ CONTAINS
END IF
!----------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,1,IFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,1,IFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,IFIELD,TZFMH,IRESP)
-#endif
ELSE
IF (ISP == TZFD%OWNER) THEN
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,1,IFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,1,IFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,IFIELD,TZFMH,IRESP)
-#endif
END IF
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
END IF
@@ -2110,12 +1579,6 @@ CONTAINS
!* 0. DECLARATIONS
! ------------
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -2152,33 +1615,20 @@ CONTAINS
END WHERE
!----------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELD),IFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELD),IFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,IFIELD,TZFMH,IRESP)
-#endif
ELSE
IF (ISP == TZFD%OWNER) THEN
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELD),IFIELD,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,SIZE(IFIELD),IFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,IFIELD,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -2203,12 +1653,6 @@ CONTAINS
!* 0. DECLARATIONS
! ------------
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -2232,10 +1676,6 @@ CONTAINS
TYPE(FD_ll), POINTER :: TZFD
INTEGER :: IRESP
TYPE(FMHEADER) :: TZFMH
-#ifdef MNH_NCWRIT
- TYPE(workfield), DIMENSION(:), POINTER :: TZRECLIST
- INTEGER,DIMENSION(6) :: TABDIM
-#endif
!----------------------------------------------------------------
!* 1.1 THE NAME OF LFIFM
@@ -2244,10 +1684,6 @@ CONTAINS
YFNLFI=TRIM(ADJUSTL(HFILEM))//'.lfi'
!print * , ' Writing Article C0 ' , HRECFM
ILENG=LEN(HFIELD)
-#ifdef MNH_NCWRIT
- TABDIM(:)=1
- TABDIM(1)=ILENG
-#endif
!
IF (ILENG==0) THEN
ILENG=1
@@ -2266,27 +1702,15 @@ CONTAINS
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,ILENG,IFIELD,TZFMH,KRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,ILENG,IFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,HFIELD,TZFMH,IRESP)
-#endif
ELSE
IF (ISP == TZFD%OWNER) THEN
TZFMH%GRID=KGRID
TZFMH%COMLEN=KLENCH
TZFMH%COMMENT=HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,ILENG,IFIELD,TZFMH,KRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.FALSE.,ILENG,IFIELD,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,HDIR,HFIELD,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -2399,12 +1823,6 @@ CONTAINS
USE MODD_FM
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!* 0.1 Declarations of arguments
!
CHARACTER(LEN=*), INTENT(IN) ::HFILEM ! FM-file name
@@ -2436,62 +1854,32 @@ CONTAINS
ITDATE(3)=TFIELD%TDATE%DAY
!-------------------------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID=KGRID
TZFMH%COMMENT='YYYYMMDD'
TZFMH%COMLEN=LEN_TRIM(TZFMH%COMMENT)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,TRIM(HRECFM)//'%TDATE',.FALSE.,3,ITDATE&
- & ,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,TRIM(HRECFM)//'%TDATE',.FALSE.,3,ITDATE&
& ,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,TRIM(HRECFM)//'%TDATE',HDIR,ITDATE,TZFMH,IRESP)
-#endif
TZFMH%COMMENT='SECONDS'
TZFMH%COMLEN=LEN_TRIM(TZFMH%COMMENT)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,TRIM(HRECFM)//'%TIME',.TRUE.,1,TFIELD%TIME&
- & ,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,TRIM(HRECFM)//'%TIME',.TRUE.,1,TFIELD%TIME&
& ,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,TRIM(HRECFM)//'%TIME',HDIR,TFIELD%TIME,TZFMH,IRESP)
-#endif
ELSE
IF (ISP == TZFD%OWNER) THEN
TZFMH%GRID=KGRID
TZFMH%COMMENT='YYYYMMDD'
TZFMH%COMLEN=LEN_TRIM(TZFMH%COMMENT)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,TRIM(HRECFM)//'%TDATE',.FALSE.,3,ITDATE&
- & ,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,TRIM(HRECFM)//'%TDATE',.FALSE.,3,ITDATE&
& ,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,TRIM(HRECFM)//'%TDATE',HDIR,ITDATE,TZFMH,IRESP)
-#endif
TZFMH%COMMENT='SECONDS'
TZFMH%COMLEN=LEN_TRIM(TZFMH%COMMENT)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,TRIM(HRECFM)//'%TIME',.TRUE.,1,TFIELD%TIME&
- & ,TZFMH,IRESP)
- END IF
-#else
-
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,TRIM(HRECFM)//'%TIME',.TRUE.,1,TFIELD%TIME&
& ,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,TRIM(HRECFM)//'%TIME',HDIR,TFIELD%TIME,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD%COMM,IERR)
@@ -2516,12 +1904,6 @@ CONTAINS
USE MODE_TOOLS_ll, ONLY : GET_GLOBALDIMS_ll
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
USE MODD_VAR_ll, ONLY : MNH_STATUSES_IGNORE
!
!* 0.1 Declarations of arguments
@@ -2569,7 +1951,6 @@ CONTAINS
END IF
!
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID=KGRID
@@ -2577,23 +1958,11 @@ CONTAINS
TZFMH%COMMENT=HCOMMENT
IF (LPACK .AND. L2D) THEN
TX3DP=>PLB(:,JPHEXT+1:JPHEXT+1,:)
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(TX3DP),TX3DP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(TX3DP),TX3DP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',TX3DP,TZFMH,IRESP)
-#endif
ELSE
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PLB),PLB,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(PLB),PLB,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',PLB,TZFMH,IRESP)
-#endif
END IF
ELSE
IF (ISP == TZFD%OWNER) THEN
@@ -2624,14 +1993,8 @@ CONTAINS
ELSE
TX3DP=>Z3D
END IF
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(TX3DP),TX3DP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(TX3DP),TX3DP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',TX3DP,TZFMH,IRESP)
-#endif
ELSE
NB_REQ=0
ALLOCATE(REQ_TAB(1))
@@ -2677,12 +2040,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
USE MODE_GATHER_ll
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -2718,7 +2075,6 @@ CONTAINS
!print * , ' Writing Article BOXX2 ' , HRECFM
!------------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID = KGRID
@@ -2731,14 +2087,8 @@ CONTAINS
! take the field as a budget
ZFIELDP=>PFIELD
END IF
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
ELSE ! multiprocessor execution
IF (ISP == TZFD%OWNER) THEN
! Allocate the box
@@ -2756,16 +2106,9 @@ CONTAINS
TZFMH%GRID = KGRID
TZFMH%COMLEN = LEN_TRIM(HCOMMENT)
TZFMH%COMMENT = HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD&
@@ -2789,12 +2132,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
USE MODE_GATHER_ll
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -2830,7 +2167,6 @@ CONTAINS
!print * , ' Writing Article BOXX3 ' , HRECFM
!------------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID = KGRID
@@ -2843,14 +2179,8 @@ CONTAINS
! take the field as a budget
ZFIELDP=>PFIELD
END IF
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
ELSE ! multiprocessor execution
IF (ISP == TZFD%OWNER) THEN
! Allocate the box
@@ -2868,16 +2198,9 @@ CONTAINS
TZFMH%GRID = KGRID
TZFMH%COMLEN = LEN_TRIM(HCOMMENT)
TZFMH%COMMENT = HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD&
@@ -2901,12 +2224,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
USE MODE_GATHER_ll
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -2942,7 +2259,6 @@ CONTAINS
!print * , ' Writing Article BOXX4 ' , HRECFM
!------------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID = KGRID
@@ -2955,14 +2271,8 @@ CONTAINS
! take the field as a budget
ZFIELDP=>PFIELD
END IF
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
ELSE ! multiprocessor execution
IF (ISP == TZFD%OWNER) THEN
! Allocate the box
@@ -2980,16 +2290,9 @@ CONTAINS
TZFMH%GRID = KGRID
TZFMH%COMLEN = LEN_TRIM(HCOMMENT)
TZFMH%COMMENT = HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD&
@@ -3013,12 +2316,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
USE MODE_GATHER_ll
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -3054,7 +2351,6 @@ CONTAINS
!print * , ' Writing Article BOXX5 ' , HRECFM
!------------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID = KGRID
@@ -3067,14 +2363,8 @@ CONTAINS
! take the field as a budget
ZFIELDP=>PFIELD
END IF
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
ELSE ! multiprocessor execution
IF (ISP == TZFD%OWNER) THEN
! Allocate the box
@@ -3093,16 +2383,9 @@ CONTAINS
TZFMH%GRID = KGRID
TZFMH%COMLEN = LEN_TRIM(HCOMMENT)
TZFMH%COMMENT = HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD&
@@ -3126,12 +2409,6 @@ CONTAINS
USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL
USE MODE_GATHER_ll
!
-!!!! MOD SB
-#ifdef MNH_NCWRIT
- USE MODD_NCOUT
- USE MODE_UTIL
-#endif
-!!!! MOD SB
!
!* 0.1 Declarations of arguments
!
@@ -3167,7 +2444,6 @@ CONTAINS
!print * , ' Writing Article BOXX6 ' , HRECFM
!------------------------------------------------------------------
TZFD=>GETFD(YFNLFI)
-! IF (ASSOCIATED(TZFD) .OR. .not.LLFIFM) THEN
IF (ASSOCIATED(TZFD)) THEN
IF (GSMONOPROC) THEN ! sequential execution
TZFMH%GRID = KGRID
@@ -3180,14 +2456,8 @@ CONTAINS
! take the field as a budget
ZFIELDP=>PFIELD
END IF
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
ELSE ! multiprocessor execution
IF (ISP == TZFD%OWNER) THEN
! Allocate the box
@@ -3206,16 +2476,9 @@ CONTAINS
TZFMH%GRID = KGRID
TZFMH%COMLEN = LEN_TRIM(HCOMMENT)
TZFMH%COMMENT = HCOMMENT
-#ifdef MNH_NCWRIT
- IF ( DEF_NC .AND. LLFIFM ) THEN
- CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
- & ,IRESP)
- END IF
-#else
IF (LLFIOUT) CALL FM_WRIT_ll(TZFD%FLU,HRECFM,.TRUE.,SIZE(ZFIELDP),ZFIELDP,TZFMH&
& ,IRESP)
IF (LIOCDF4) CALL NCWRIT(TZFD%CDF,HRECFM,'XY',ZFIELDP,TZFMH,IRESP)
-#endif
END IF
!
CALL MPI_BCAST(IRESP,1,MPI_INTEGER,TZFD%OWNER-1,TZFD&
diff --git a/src/MNH/diag.f90 b/src/MNH/diag.f90
index 4c79527a0..73e49a0be 100644
--- a/src/MNH/diag.f90
+++ b/src/MNH/diag.f90
@@ -63,7 +63,7 @@
!! advected with PPM
!! 03/2010 (G.Tanguy) Clean up of unuseful variables
!! 05/2010 Add lidar
-!!! 03/2012 (S. Bielli) Add NAM_NCOUT for netcdf output
+!!! 03/2012 (S. Bielli) Add NAM_NCOUT for netcdf output (removed 11/07/2016)
!! 03/2013 (O.Caumont) Modif call aircraft_balloon
!! 03/2013 (C. Augros) Add variables for radar simulator in NAMELIST:
!! NBAZIM,LSNRT,XSNRMIN
@@ -75,9 +75,11 @@
!! 09/2015 (S. Bielli) Add netcdf call for phys_param
!! 04/2016 (G.Delautier) replace print by write in OUTPUT LISTING
!! 06/2016 (G.Delautier) phasage surfex 8
+!! 11/07/2016 (P.Wautelet) removed MNH_NCWRIT define
!! 09/2016 (JP Pinty) Add LIMA
!! 10/2016 (C.LAC) add LVISI
!! 10/2016 (F Brosse) Add prod/loss terms computation for chemistry
+!!
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -158,11 +160,6 @@ USE MODI_DIAG_SURF_ATM_N
USE MODI_WRITE_DIAG_SURF_ATM_N
USE MODD_MNH_SURFEX_n
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
-!
USE MODN_CONF, ONLY : JPHEXT , NHALO
!
IMPLICIT NONE
@@ -403,12 +400,6 @@ CALL POSNAM(ILUNAM,'NAM_CONFZ',GFOUND)
IF (GFOUND) THEN
READ(UNIT=ILUNAM,NML=NAM_CONFZ)
END IF
-#ifdef MNH_NCWRIT
-CALL POSNAM(ILUNAM,'NAM_NCOUT',GFOUND)
-IF (GFOUND) THEN
- READ(UNIT=ILUNAM,NML=NAM_NCOUT)
-END IF
-#endif
CALL POSNAM(ILUNAM,'NAM_CONFIO',GFOUND)
IF (GFOUND) THEN
READ(UNIT=ILUNAM,NML=NAM_CONFIO)
@@ -504,19 +495,7 @@ ENDIF
!
!* 4.0 Stores the fields in MESONH files if necessary
!
-#ifdef MNH_NCWRIT
-NC_WRITE = LNETCDF
-CALL WRITE_LFIFM1_FOR_DIAG(YFMFILE,CDAD_NAME(1))
-IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
-! print * , ' SECOND WRITE '
- CALL WRITE_LFIFM1_FOR_DIAG(YFMFILE,CDAD_NAME(1))
- DEF_NC=.TRUE.
-END IF
-NC_WRITE = .FALSE.
-#else
CALL WRITE_LFIFM1_FOR_DIAG(YFMFILE,CDAD_NAME(1))
-#endif
!
WRITE(ILUOUT0,*) ' '
WRITE(ILUOUT0,*) 'DIAG AFTER WRITE_LFIFM1_FOR_DIAG'
@@ -567,22 +546,8 @@ IF ( LAIRCRAFT_BALLOON ) THEN
TXDTBAL%TDATE%DAY, &
TXDTBAL%TIME )
ENDDO
-#ifdef MNH_NCWRIT
- NC_FILE=''
- NC_WRITE=LNETCDF
CALL WRITE_LFIFMN_FORDIACHRO_n(YFMDIAC)
CALL WRITE_AIRCRAFT_BALLOON(YFMDIAC)
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_LFIFMN_FORDIACHRO_n(YFMDIAC)
- CALL WRITE_AIRCRAFT_BALLOON(YFMDIAC)
- DEF_NC=.TRUE.
- NC_WRITE = .FALSE.
- END IF
-#else
- CALL WRITE_LFIFMN_FORDIACHRO_n(YFMDIAC)
- CALL WRITE_AIRCRAFT_BALLOON(YFMDIAC)
-#endif
CALL MENU_DIACHRO(YFMDIAC,CLUOUT,'END')
CALL FMCLOS_ll(YFMDIAC,'KEEP',CLUOUT,IRESP)
WRITE(ILUOUT0,*) ' '
@@ -710,26 +675,9 @@ ZCHEM=0.
XTIME_LES=0.
XTIME_LES_BU_PROCESS=0.
XTIME_BU_PROCESS=0.
-#ifdef MNH_NCWRIT
-IF ( LNETCDF ) THEN
- DEF_NC = .TRUE.
- NC_WRITE=LNETCDF
- NC_FILE='phy'
- LLFIFM = .FALSE.
- CALL WRITE_PHYS_PARAM(YFMFILE)
- DEF_NC=.FALSE.
- LLFIFM = .TRUE.
-END IF
-!
CALL PHYS_PARAM_n(1,YFMFILE,GCLOSE_OUT, &
ZRAD,ZSHADOWS,ZDCONV,ZGROUND,ZMAFL,ZDRAG, &
ZTURB,ZTRACER, ZCHEM,ZTIME_BU,GMASKkids)
-DEF_NC=.TRUE.
-#else
-CALL PHYS_PARAM_n(1,YFMFILE,GCLOSE_OUT, &
- ZRAD,ZSHADOWS,ZDCONV,ZGROUND,ZMAFL,ZDRAG, &
- ZTURB,ZTRACER, ZCHEM,ZTIME_BU,GMASKkids)
-#endif
WRITE(ILUOUT0,*) 'DIAG AFTER PHYS_PARAM1'
!
!* restores the initial flags
@@ -747,36 +695,11 @@ ZTIME1=ZTIME2
!
IF (CSURF=='EXTE') THEN
CALL GOTO_SURFEX(1)
-#ifdef MNH_NCWRIT
- NC_WRITE= LNETCDF
- NC_FILE = 'sf1'
CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
-! print * , ' SECOND WRITE '
- CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
- DEF_NC=.TRUE.
- END IF
CALL DIAG_SURF_ATM_n(YSURF_CUR%IM%DGEI, YSURF_CUR%FM%DGF, YSURF_CUR%DGL, YSURF_CUR%IM%DGI, &
YSURF_CUR%SM%DGS, YSURF_CUR%DGU, YSURF_CUR%TM%DGT, YSURF_CUR%WM%DGW, &
YSURF_CUR%U, YSURF_CUR%USS,'MESONH')
- NC_WRITE= LNETCDF
- NC_FILE = 'sf2'
CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
-! print * , ' SECOND WRITE '
- CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
- DEF_NC=.TRUE.
- END IF
- !!!!!! MODIF SB
-#else
- CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
- CALL DIAG_SURF_ATM_n(YSURF_CUR%IM%DGEI, YSURF_CUR%FM%DGF, YSURF_CUR%DGL, YSURF_CUR%IM%DGI, &
- YSURF_CUR%SM%DGS, YSURF_CUR%DGU, YSURF_CUR%TM%DGT, YSURF_CUR%WM%DGW, &
- YSURF_CUR%U, YSURF_CUR%USS,'MESONH')
- CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
-#endif
WRITE(ILUOUT0,*) ' '
WRITE(ILUOUT0,*) 'DIAG AFTER WRITE_DIAG_SURF_ATM_n'
ENDIF
@@ -789,20 +712,7 @@ ZTIME1=ZTIME2
!
!* 7.0 Stores other fields in MESONH files if necessary
!
-#ifdef MNH_NCWRIT
-NC_WRITE = LNETCDF
-NC_FILE='dgs'
-CALL WRITE_LFIFM1_FOR_DIAG_SUPP(YFMFILE)
-IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
-! print * , ' SECOND WRITE '
- CALL WRITE_LFIFM1_FOR_DIAG_SUPP(YFMFILE)
- DEF_NC=.TRUE.
-END IF
-!!!!!! MODIF SB
-#else
CALL WRITE_LFIFM1_FOR_DIAG_SUPP(YFMFILE)
-#endif
WRITE(ILUOUT0,*) ' '
WRITE(ILUOUT0,*) 'DIAG AFTER WRITE_LFIFM1_FOR_DIAG_SUPP'
!
diff --git a/src/MNH/modd_ncout.f90 b/src/MNH/modd_ncout.f90
deleted file mode 100644
index 65c8f5b34..000000000
--- a/src/MNH/modd_ncout.f90
+++ /dev/null
@@ -1,42 +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.
-#ifdef MNH_NCWRIT
-! #################
- MODULE MODD_NCOUT
-! #################
-!
-!!**** *MODD_NCOUT* - declaration of configuration variables
-!!
-!! PURPOSE
-!! -------
-! Flag for NETCDF output
-!
-!!
-!!** IMPLICIT ARGUMENTS
-!! ------------------
-!! None
-!!
-!! REFERENCE
-!! ---------
-!! AUTHOR
-!! ------
-!! S. Bielli L.A.
-!!
-!! MODIFICATIONS
-!! -------------
-!! Original 26/03/2012
-!!
-!-------------------------------------------------------------------------------
-!
-!* 0. DECLARATIONS
-! ------------
-!
-IMPLICIT NONE
-!
-LOGICAL,SAVE :: LNETCDF = .FALSE. ! default no netcdf output
-LOGICAL,SAVE :: LLFIFM = .TRUE. ! default lfi output
-!
-END MODULE MODD_NCOUT
-#endif
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index 8b07c2ce1..f32518126 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -245,6 +245,7 @@ END MODULE MODI_MODEL_n
!! _ Add OSPLIT_WENO
!! _ Add droplet deposition
!! 10/2016 (M.Mazoyer) New KHKO output fields
+!! P.Wautelet : 11/07/2016 : removed MNH_NCWRIT define
!!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -396,10 +397,6 @@ USE MODI_WRITE_DIAG_SURF_ATM_N
USE MODI_SERIES_N
USE MODI_LES_N
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
USE MODI_GET_HALO
USE MODE_MPPDB
!
@@ -612,19 +609,7 @@ IF (KTCOUNT == 1) THEN
CALL FMOPEN_ll(CFMDIAC,'WRITE',CLUOUT,INPRAR,ITYPE,NVERB,ININAR,IRESP)
YDESFM=ADJUSTL(ADJUSTR(CFMDIAC)//'.des')
CALL WRITE_DESFM_n(IMI,YDESFM,CLUOUT)
-#ifdef MNH_NCWRIT
- NC_WRITE = LNETCDF
- NC_FILE=''
- CALL WRITE_LFIFMN_FORDIACHRO_n(CFMDIAC)
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_LFIFMN_FORDIACHRO_n(CFMDIAC)
- DEF_NC=.TRUE.
- END IF
- NC_WRITE = .FALSE.
-#else
CALL WRITE_LFIFMN_FORDIACHRO_n(CFMDIAC)
-#endif
!
!* 1.4 Initialization of the list of fields for the halo updates
!
@@ -953,39 +938,12 @@ DO JOUT = 1,NOUT_NUMB
YDESFM=ADJUSTL(ADJUSTR(YFMFILE)//'.des')
!
CALL WRITE_DESFM_n(IMI,YDESFM,CLUOUT)
-#ifdef MNH_NCWRIT
- NC_WRITE = LNETCDF
- NC_FILE = ''
- CALL WRITE_LFIFM_n(YFMFILE,YDADFILE)
- COUTFMFILE = YFMFILE
- CALL MNHWRITE_ZS_DUMMY_n(CPROGRAM)
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_LFIFM_n(YFMFILE,YDADFILE)
- COUTFMFILE = YFMFILE
- CALL MNHWRITE_ZS_DUMMY_n(CPROGRAM)
- DEF_NC=.TRUE.
- END IF
- NC_WRITE = .FALSE.
-#else
CALL WRITE_LFIFM_n(YFMFILE,YDADFILE)
COUTFMFILE = YFMFILE
CALL MNHWRITE_ZS_DUMMY_n(CPROGRAM)
-#endif
IF (CSURF=='EXTE') THEN
CALL GOTO_SURFEX(IMI)
-#ifdef MNH_NCWRIT
- NC_WRITE = LNETCDF
- NC_FILE = 'sf1'
- CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
- DEF_NC=.TRUE.
- END IF
-#else
CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
-#endif
END IF
!
! Reinitialize Lagragian variables at every model output
@@ -1340,27 +1298,11 @@ XT_RELAX = XT_RELAX + ZTIME2 - ZTIME1 &
!
ZTIME1 = ZTIME2
!
-#ifdef MNH_NCWRIT
-IF ( LNETCDF .AND. GCLOSE_OUT ) THEN
- DEF_NC = .TRUE.
- NC_WRITE=LNETCDF
- NC_FILE='phy'
- LLFIFM = .FALSE.
- CALL WRITE_PHYS_PARAM(YFMFILE)
- DEF_NC=.FALSE.
- LLFIFM = .TRUE.
-END IF
+!!Was called if MNH_NCWRIT: CALL WRITE_PHYS_PARAM(YFMFILE)
CALL PHYS_PARAM_n(KTCOUNT,YFMFILE, GCLOSE_OUT, &
XT_RAD,XT_SHADOWS,XT_DCONV,XT_GROUND,XT_MAFL, &
XT_DRAG,XT_TURB,XT_TRACER, &
XT_CHEM,ZTIME,GMASKkids)
-DEF_NC=.TRUE.
-#else
-CALL PHYS_PARAM_n(KTCOUNT,YFMFILE, GCLOSE_OUT, &
- XT_RAD,XT_SHADOWS,XT_DCONV,XT_GROUND,XT_MAFL, &
- XT_DRAG,XT_TURB,XT_TRACER, &
- XT_CHEM,ZTIME,GMASKkids)
-#endif
!
IF (CDCONV/='NONE') THEN
XPACCONV = XPACCONV + XPRCONV * XTSTEP
@@ -1377,19 +1319,7 @@ DO JOUT = 1,NOUT_NUMB
CALL DIAG_SURF_ATM_n(YSURF_CUR%IM%DGEI, YSURF_CUR%FM%DGF, YSURF_CUR%DGL, YSURF_CUR%IM%DGI, &
YSURF_CUR%SM%DGS, YSURF_CUR%DGU, YSURF_CUR%TM%DGT, YSURF_CUR%WM%DGW, &
YSURF_CUR%U, YSURF_CUR%USS,'MESONH')
-#ifdef MNH_NCWRIT
- NC_WRITE=LNETCDF
- NC_FILE='sf2'
- CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
- DEF_NC=.TRUE.
- NC_WRITE = .FALSE.
- END IF
-#else
CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
-#endif
END IF
END IF
END DO
@@ -1713,26 +1643,6 @@ IF (CCLOUD /= 'NONE' .AND. CELEC == 'NONE') THEN
ZSEA(:,:) = 0.
ZTOWN(:,:)= 0.
CALL MNHGET_SURF_PARAM_n (PSEA=ZSEA(:,:),PTOWN=ZTOWN(:,:))
-#ifdef MNH_NCWRIT
- NC_FILE='phy'
- DEF_NC=.FALSE.
- CALL RESOLVED_CLOUD ( CCLOUD, CACTCCN, CSCONV, CMF_CLOUD, NRR, NSPLITR, &
- NSPLITG, IMI, KTCOUNT, &
- CLBCX,CLBCY,YFMFILE, CLUOUT, CRAD, CTURBDIM, &
- GCLOSE_OUT, LSUBG_COND,LSIGMAS,CSUBG_AUCV,XTSTEP, &
- XZZ, XRHODJ, XRHODREF, XEXNREF, &
- XPABST, XTHT,XRT,XSIGS,VSIGQSAT,XMFCONV,XTHM,XRCM, &
- XPABSM, ZWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, &
- XSVT, XRSVS, &
- XSRCT, XCLDFR,XCIT, &
- LSEDIC,KACTIT, KSEDC, KSEDI, KRAIN, KWARM, KHHONI, &
- LCONVHG, XCF_MF,XRC_MF, XRI_MF, &
- XINPRC,XINPRR, XINPRR3D, XEVAP3D, &
- XINPRS, XINPRG, XINPRH, XSOLORG , XMI, &
- XINDEP, XSUPSAT, XNACT, XNPRO,XSSPRO, &
- ZSEA, ZTOWN )
- DEF_NC=.TRUE.
-#else
CALL RESOLVED_CLOUD ( CCLOUD, CACTCCN, CSCONV, CMF_CLOUD, NRR, NSPLITR, &
NSPLITG, IMI, KTCOUNT, &
CLBCX,CLBCY,YFMFILE, CLUOUT, CRAD, CTURBDIM, &
@@ -1748,29 +1658,8 @@ IF (CCLOUD /= 'NONE' .AND. CELEC == 'NONE') THEN
XINPRS, XINPRG, XINPRH, XSOLORG , XMI, &
XINDEP, XSUPSAT, XNACT, XNPRO,XSSPRO, &
ZSEA, ZTOWN )
-#endif
DEALLOCATE(ZTOWN)
ELSE
-#ifdef MNH_NCWRIT
- NC_FILE='phy'
- DEF_NC=.FALSE.
- CALL RESOLVED_CLOUD ( CCLOUD, CACTCCN, CSCONV, CMF_CLOUD, NRR, NSPLITR, &
- NSPLITG, IMI, KTCOUNT, &
- CLBCX,CLBCY,YFMFILE, CLUOUT, CRAD, CTURBDIM, &
- GCLOSE_OUT, LSUBG_COND,LSIGMAS,CSUBG_AUCV, &
- XTSTEP,XZZ, XRHODJ, XRHODREF, XEXNREF, &
- XPABST, XTHT,XRT,XSIGS,VSIGQSAT,XMFCONV,XTHM,XRCM, &
- XPABSM, ZWT_ACT_NUC,XDTHRAD, XRTHS, XRRS, &
- XSVT, XRSVS, &
- XSRCT, XCLDFR,XCIT, &
- LSEDIC,KACTIT, KSEDC, KSEDI, KRAIN, KWARM, KHHONI, &
- LCONVHG, XCF_MF,XRC_MF, XRI_MF, &
- XINPRC,XINPRR, XINPRR3D, XEVAP3D, &
- XINPRS,XINPRG,XINPRH &
- XSOLORG, XMI, &
- XINDEP, XSUPSAT, XNACT, XNPRO,XSSPRO )
- DEF_NC=.TRUE.
-#else
CALL RESOLVED_CLOUD ( CCLOUD, CACTCCN, CSCONV, CMF_CLOUD, NRR, NSPLITR, &
NSPLITG, IMI, KTCOUNT, &
CLBCX,CLBCY,YFMFILE, CLUOUT, CRAD, CTURBDIM, &
@@ -1786,7 +1675,6 @@ IF (CCLOUD /= 'NONE' .AND. CELEC == 'NONE') THEN
XINPRS,XINPRG, XINPRH, &
XSOLORG, XMI,&
XINDEP, XSUPSAT, XNACT, XNPRO,XSSPRO )
-#endif
END IF
XRTHS_CLD = XRTHS - XRTHS_CLD
XRRS_CLD = XRRS - XRRS_CLD
@@ -2064,31 +1952,6 @@ END IF
!
IF (OEXIT) THEN
!
-#ifdef MNH_NCWRIT
- NC_WRITE = LNETCDF
- NC_FILE = 'ser'
- IF (LSERIES) CALL WRITE_SERIES_n(CFMDIAC,CLUOUT )
- CALL WRITE_AIRCRAFT_BALLOON(CFMDIAC)
- CALL WRITE_STATION_n(CFMDIAC)
- CALL WRITE_PROFILER_n(CFMDIAC)
- CALL WRITE_LES_n(' ')
- CALL WRITE_LES_n('A')
- CALL WRITE_LES_n('E')
- CALL WRITE_LES_n('H')
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- IF (LSERIES) CALL WRITE_SERIES_n(CFMDIAC,CLUOUT )
- CALL WRITE_AIRCRAFT_BALLOON(CFMDIAC)
- CALL WRITE_STATION_n(CFMDIAC)
- CALL WRITE_PROFILER_n(CFMDIAC)
- CALL WRITE_LES_n(' ')
- CALL WRITE_LES_n('A')
- CALL WRITE_LES_n('E')
- CALL WRITE_LES_n('H')
- DEF_NC=.TRUE.
- END IF
- NC_WRITE = .FALSE.
-#else
IF (LSERIES) CALL WRITE_SERIES_n(CFMDIAC,CLUOUT )
CALL WRITE_AIRCRAFT_BALLOON(CFMDIAC)
CALL WRITE_STATION_n(CFMDIAC)
@@ -2097,7 +1960,6 @@ IF (OEXIT) THEN
CALL WRITE_LES_n('A')
CALL WRITE_LES_n('E')
CALL WRITE_LES_n('H')
-#endif
CALL MENU_DIACHRO(CFMDIAC,CLUOUT,'END')
CALL FMCLOS_ll(CFMDIAC,'KEEP',CLUOUT,IRESP)
!
diff --git a/src/MNH/modn_ncout.f90 b/src/MNH/modn_ncout.f90
deleted file mode 100644
index 7425d387a..000000000
--- a/src/MNH/modn_ncout.f90
+++ /dev/null
@@ -1,44 +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.
-#ifdef MNH_NCWRIT
-! ################
- MODULE MODN_NCOUT
-! ################
-!
-!!**** *MODN_NCOUT* - declaration of namelist NAM_NCOUT
-!!
-!! PURPOSE
-!! -------
-! writting of NETCDF output
-!
-!!
-!!** IMPLICIT ARGUMENTS
-!! ------------------
-!! Module MODD_NCOUT : contains declaration of configuration variables
-!!
-!!
-!! REFERENCE
-!! ---------
-!!
-!! AUTHOR
-!! ------
-!! S. Bielli L.A.
-!!
-!! MODIFICATIONS
-!! -------------
-!! Original 26/03/2012
-!-------------------------------------------------------------------------------
-!
-!* 0. DECLARATIONS
-! ------------
-!
-USE MODD_NCOUT
-!
-IMPLICIT NONE
-!
-NAMELIST/NAM_NCOUT/ LNETCDF,LLFIFM
-!
-END MODULE MODN_NCOUT
-#endif
diff --git a/src/MNH/open_nestpgd_files.f90 b/src/MNH/open_nestpgd_files.f90
index 7d83dcd40..e9b5de36a 100644
--- a/src/MNH/open_nestpgd_files.f90
+++ b/src/MNH/open_nestpgd_files.f90
@@ -68,6 +68,7 @@ END MODULE MODI_OPEN_NESTPGD_FILES
!! 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
+!! P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -86,9 +87,6 @@ USE MODE_POS
!
USE MODE_MODELN_HANDLER
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-#endif
USE MODN_CONFIO
!
USE MODD_PARAMETERS, ONLY : JPHEXT
@@ -297,10 +295,6 @@ DO JPGD=1,NMODEL
HNESTPGD(JPGD) = ADJUSTR( YSHORTPGD(JPGD))//'.nest'//ADJUSTL(YNEST)
HNESTPGD(JPGD) = ADJUSTL(HNESTPGD(JPGD))
END DO
-#ifdef MNH_NCWRIT
-CALL POSNAM(IPRE_NEST_PGD,'NAM_NCOUT',GFOUND,ILUOUT0)
-IF (GFOUND) READ(UNIT=IPRE_NEST_PGD,NML=NAM_NCOUT)
-#endif
!
CALL POSNAM(IPRE_NEST_PGD,'NAM_CONFIO',GFOUND,ILUOUT0)
IF (GFOUND) READ(UNIT=IPRE_NEST_PGD,NML=NAM_CONFIO)
diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90
index 852fdd356..0268f66f2 100644
--- a/src/MNH/prep_ideal_case.f90
+++ b/src/MNH/prep_ideal_case.f90
@@ -312,6 +312,7 @@
!! missing '&' in continuation string 3/12/2014 J.Escobar
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! 06/2016 (G.Delautier) phasage surfex 8
+!! P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -400,10 +401,6 @@ USE MODD_SUB_MODEL_n
USE MODE_MNH_TIMING
USE MODN_CONFZ
!JUAN
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
USE MODN_CONFIO
USE MODI_TH_R_FROM_THL_RT_3D
!
@@ -683,10 +680,6 @@ IF (GFOUND) READ(UNIT=NLUPRE,NML=NAM_CONF_PRE)
CALL POSNAM(NLUPRE,'NAM_CONFZ',GFOUND,NLUOUT)
IF (GFOUND) READ(UNIT=NLUPRE,NML=NAM_CONFZ)
!JUANZ
-#ifdef MNH_NCWRIT
-CALL POSNAM(NLUPRE,'NAM_NCOUT',GFOUND,NLUOUT)
-IF (GFOUND) READ(UNIT=NLUPRE,NML=NAM_NCOUT)
-#endif
CALL POSNAM(NLUPRE,'NAM_CONFIO',GFOUND,NLUOUT)
IF (GFOUND) READ(UNIT=NLUPRE,NML=NAM_CONFIO)
CALL SET_CONFIO_ll(LCDF4, LLFIOUT, LLFIREAD)
@@ -1736,17 +1729,7 @@ CALL FMOPEN_ll(CINIFILE,'WRITE',CLUOUT,NNPRAR,NTYPE,NVERB,NNINAR,NRESP)
!
CALL WRITE_DESFM_n(1,CDESFM,CLUOUT)
!
-#ifdef MNH_NCWRIT
-NC_WRITE = LNETCDF
CALL WRITE_LFIFM_n(CINIFILE,' ') ! There is no DAD model for PREP_IDEAL_CASE
-IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_LFIFM_n(CINIFILE,' ') ! There is no DAD model for PREP_IDEAL_CASE
- DEF_NC=.TRUE.
-END IF
-#else
-CALL WRITE_LFIFM_n(CINIFILE,' ') ! There is no DAD model for PREP_IDEAL_CASE
-#endif
!
CALL SECOND_MNH2(ZTIME2)
!
@@ -1801,23 +1784,6 @@ IF (CSURF =='EXTE') THEN
CSTORAGE_TYPE='PG'
COUTFMFILE = CINIFILEPGD
CALL FMOPEN_ll(CINIFILEPGD,'WRITE',CLUOUT,NNPRAR,NTYPE,NVERB,NNINAR,NRESP)
-#ifdef MNH_NCWRIT
- CALL FMWRIT(CINIFILEPGD,'PROGRAM ',CLUOUT,'--',CPROGRAM,0,1,' ',NRESP)
- CALL FMWRIT(CINIFILEPGD,'SURF ',CLUOUT,'--','EXTE',0,1,' ',NRESP)
- CALL FMWRIT(CINIFILEPGD,'L1D ',CLUOUT,'--',L1D,0,1,' ',NRESP)
- CALL FMWRIT(CINIFILEPGD,'L2D ',CLUOUT,'--',L2D,0,1,' ',NRESP)
- CALL FMWRIT(CINIFILEPGD,'PACK ',CLUOUT,'--',LPACK,0,1,' ',NRESP)
- CALL WRITE_HGRID(1,CINIFILEPGD,' ')
- NC_FILE='sf1'
- NC_WRITE=LNETCDF
- CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
- DEF_NC=.TRUE.
- NC_WRITE = .FALSE.
- END IF
-#else
CALL FMWRIT(CINIFILEPGD,'PROGRAM ',CLUOUT,'--',CPROGRAM,0,1,' ',NRESP)
CALL FMWRIT(CINIFILEPGD,'SURF ',CLUOUT,'--','EXTE',0,1,' ',NRESP)
CALL FMWRIT(CINIFILEPGD,'L1D ',CLUOUT,'--',L1D,0,1,' ',NRESP)
@@ -1825,7 +1791,6 @@ IF (CSURF =='EXTE') THEN
CALL FMWRIT(CINIFILEPGD,'PACK ',CLUOUT,'--',LPACK,0,1,' ',NRESP)
CALL WRITE_HGRID(1,CINIFILEPGD,' ')
CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
-#endif
CSTORAGE_TYPE='TT'
ENDIF
diff --git a/src/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90
index f6218f71c..878dc061c 100644
--- a/src/MNH/prep_nest_pgd.f90
+++ b/src/MNH/prep_nest_pgd.f90
@@ -93,6 +93,7 @@
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
!! 06/2016 (G.Delautier) phasage surfex 8
+!! P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -128,11 +129,6 @@ USE MODI_INIT_PGD_SURF_ATM
USE MODI_WRITE_PGD_SURF_ATM_N
USE MODD_MNH_SURFEX_n
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
-!
USE MODE_SPLITTINGZ_ll, ONLY : INI_PARAZ_ll
USE MODD_VAR_ll, ONLY : NPROC, IP, NMNH_COMM_WORLD
USE MODE_MNH_WORLD, ONLY : INIT_NMNH_COMM_WORLD
@@ -355,27 +351,8 @@ DO JPGD=1,NMODEL
COUTFMFILE = CNESTPGD(JPGD)
CALL GOTO_MODEL(JPGD)
CALL GOTO_SURFEX(JPGD)
-#ifdef MNH_NCWRIT
- NC_WRITE = LNETCDF
- CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
- IF (LNETCDF.AND..NOT.LCARTESIAN) THEN
- LLFIFM = .FALSE.
- LLFIFM = .TRUE.
- END IF
-!* 11. SMOOTH OROGRAPHY WRITING
- CALL WRITE_ZSMT_n(CNESTPGD(JPGD))
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
-!* 11. SMOOTH OROGRAPHY WRITING
- CALL WRITE_ZSMT_n(CNESTPGD(JPGD))
- DEF_NC=.TRUE.
- NC_WRITE = .FALSE.
- END IF
-#else
CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
CALL WRITE_ZSMT_n(CNESTPGD(JPGD))
-#endif
END DO
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90
index 2f5a3e205..0bbe1ca7a 100644
--- a/src/MNH/prep_pgd.f90
+++ b/src/MNH/prep_pgd.f90
@@ -67,7 +67,8 @@
!! J.Escobar : 05/10/2015 : missing JPHEXT for LAT/LON/ZS/ZSMT writing
!! M.Moge 11/2015 disable the creation of files on multiple
!! Z-levels when using parallel IO for PREP_PGD
-!! 06/2016 (G.Delautier) phasage surfex 8
+!! 06/2016 (G.Delautier) phasage surfex 8
+!! P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
!! 10/2016 (S.Faroux S.Bielli) correction for NHALO=0
!----------------------------------------------------------------------------
!
@@ -106,11 +107,6 @@ USE MODI_PGD_SURF_ATM
USE MODI_WRITE_PGD_SURF_ATM_N
USE MODD_MNH_SURFEX_n
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-USE MODE_FMREAD
-#endif
USE MODE_MPPDB
USE MODI_EXTEND_GRID_ON_HALO
!
@@ -136,7 +132,6 @@ REAL :: XSMOOTH_ZS = XUNDEF ! optional uniform smooth orography fo
REAL, DIMENSION(:,:),ALLOCATABLE :: ZWORK ! work array for lat and lon reshape
REAL, DIMENSION(:,:),ALLOCATABLE :: ZWORK_LAT ! work array for lat and lon reshape
REAL, DIMENSION(:,:),ALLOCATABLE :: ZWORK_LON ! work array for lat and lon reshape
-REAL, DIMENSION(:,:),ALLOCATABLE :: ZZS ! work array for lat and lon reshape
CHARACTER(LEN=16) :: YRECFM ! name of record
INTEGER :: IGRID ! grid location
INTEGER :: ILENCH ! length of comment string
@@ -199,11 +194,6 @@ ENDIF
CALL POSNAM(ILUNAM,'NAM_CONFIO',GFOUND)
IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONFIO)
CALL SET_CONFIO_ll(LCDF4, LLFIOUT, LLFIREAD)
-!SB
-#ifdef MNH_NCWRIT
-CALL POSNAM(ILUNAM,'NAM_NCOUT',GFOUND)
-IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_NCOUT)
-#endif
!
CALL CLOSE_ll('PRE_PGD1.nam')
!
@@ -277,68 +267,6 @@ CALL FMWRIT(COUTFMFILE,'XOR ',CLUOUT0,'--',NXOR,0,1,' ',IRESP)
CALL FMWRIT(COUTFMFILE,'YOR ',CLUOUT0,'--',NYOR,0,1,' ',IRESP)
CALL FMWRIT(COUTFMFILE,'JPHEXT ',CLUOUT0,'--',JPHEXT,0,1,' ',IRESP)
!
-#ifdef MNH_NCWRIT
-NC_WRITE = LNETCDF
-CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
-IF (LNETCDF.AND..NOT.LCARTESIAN) THEN
- LLFIFM = .FALSE.
-!!!! WRITE LAT and LON
- CALL GET_DIM_PHYS_ll('B',IIMAX,IJMAX)
- ALLOCATE(ZWORK(IIMAX+NHALO*2,IJMAX+NHALO*2))
- ALLOCATE(ZWORK_LAT(IIMAX+2*JPHEXT,IJMAX+2*JPHEXT))
- ALLOCATE(ZWORK_LON(IIMAX+2*JPHEXT,IJMAX+2*JPHEXT))
- ZWORK=RESHAPE(YSURF_CUR%UG%XLAT, (/ (IIMAX+NHALO*2),(IJMAX+NHALO*2) /) )
- IF (NHALO/=0) THEN
- ZWORK_LAT=ZWORK(NHALO:(IIMAX+NHALO+1),NHALO:(IJMAX+NHALO+1))
- ELSE
- ZWORK_LAT(2:IIMAX+1,2:IJMAX+1)=ZWORK
- ZWORK_LAT(1,:) = ZWORK_LAT(2,:)
- ZWORK_LAT(IIMAX+2,:) = ZWORK_LAT(IIMAX+1,:)
- ZWORK_LAT(:,1) = ZWORK_LAT(:,2)
- ZWORK_LAT(:,IJMAX+2) = ZWORK_LAT(:,IJMAX+1)
- ENDIF
-!!
-CALL FMWRIT(COUTFMFILE,'LAT',CLUOUT0,'XY',ZWORK_LAT,1,21,'X_Y_latitude (degree)',IRESP)
- ZWORK=RESHAPE(YSURF_CUR%UG%XLON, (/ IIMAX+NHALO*2,IJMAX+NHALO*2 /) )
- IF (NHALO/=0) THEN
- ZWORK_LON=ZWORK(NHALO:(IIMAX+NHALO+1),NHALO:(IJMAX+NHALO+1))
- ELSE
- ZWORK_LON(2:IIMAX+1,2:IJMAX+1)=ZWORK
- ZWORK_LON(1,:) = ZWORK_LON(2,:)
- ZWORK_LON(IIMAX+2,:) = ZWORK_LON(IIMAX+1,:)
- ZWORK_LON(:,1) = ZWORK_LAT(:,2)
- ZWORK_LON(:,IJMAX+2) = ZWORK_LON(:,IJMAX+1)
- ENDIF
-CALL FMWRIT(COUTFMFILE,'LON',CLUOUT0,'XY',ZWORK_LON,1,22,'X_Y_longitude (degree)',IRESP)
- DEALLOCATE(ZWORK)
- LLFIFM = .TRUE.
-END IF
-!* 4. Computes and writes smooth orography for SLEVE coordinate
-! ---------------------------------------------------------
-!CALL ZSMT_PGD(COUTFMFILE,NZSFILTER,NSLEVE,XSMOOTH_ZS,LHSLOP,XHSLOP)
-CALL ZSMT_PGD(COUTFMFILE,NZSFILTER,NSLEVE,XSMOOTH_ZS)
-
-IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
- IF (LNETCDF.AND..NOT.LCARTESIAN) THEN
- LLFIFM = .FALSE.
-!!!! WRITE LAT and LON
- CALL FMWRIT(COUTFMFILE,'LAT',CLUOUT0,'XY',ZWORK_LAT,1,21,'X_Y_latitude (degree)',IRESP)
- CALL FMWRIT(COUTFMFILE,'LON',CLUOUT0,'XY',ZWORK_LON,1,22,'X_Y_longitude (degree)',IRESP)
- END IF
- ALLOCATE(ZZS(IIMAX+2*JPHEXT,IJMAX+2*JPHEXT))
-!!!! writes smooth orography for SLEVE coordinate in netcdf
- YRECFM = 'ZS '
- CALL FMREAD(COUTFMFILE,YRECFM,CLUOUT0,'XY',ZZS,IGRID,ILENCH,YCOMMENT,IRESP)
- CALL FMWRIT(COUTFMFILE,'ZS',CLUOUT0,'XY',ZZS,IGRID,ILENCH,YCOMMENT,IRESP)
- YRECFM = 'ZSMT '
- CALL FMREAD(COUTFMFILE,YRECFM,CLUOUT0,'XY',ZZS,IGRID,ILENCH,YCOMMENT,IRESP)
- CALL FMWRIT(COUTFMFILE,'ZSMT',CLUOUT0,'XY',ZZS,IGRID,ILENCH,YCOMMENT,IRESP)
- DEF_NC=.TRUE.
- NC_WRITE = .FALSE.
-END IF
-#else
CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
!* 4. Computes and writes smooth orography for SLEVE coordinate
! ---------------------------------------------------------
@@ -381,8 +309,9 @@ IF (.NOT.LCARTESIAN) THEN
IGRID=1
ILENCH=LEN(YCOMMENT)
CALL FMWRIT(COUTFMFILE,YRECFM,CLUOUT0,'XY',ZWORK_LON,IGRID,ILENCH,YCOMMENT,IRESP)
+ !
+ DEALLOCATE(ZWORK,ZWORK_LAT,ZWORK_LON)
END IF
-#endif
!
!
WRITE(ILUOUT0,*)
diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90
index 659452539..e25cbc1bf 100644
--- a/src/MNH/prep_real_case.f90
+++ b/src/MNH/prep_real_case.f90
@@ -380,6 +380,7 @@
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! M.Leriche 2015 : add LUSECHEM dans NAM_CH_CONF
!! 06/2016 (G.Delautier) phasage surfex 8
+!! P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
!! B.VIE 2016 : LIMA
!-------------------------------------------------------------------------------
!
@@ -395,10 +396,6 @@ USE MODE_ll
USE MODE_MODELN_HANDLER
USE MODE_FMREAD
USE MODN_CONFZ
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
!
USE MODI_DEFAULT_DESFM_n ! interface modules
USE MODI_OPEN_PRC_FILES
@@ -687,10 +684,6 @@ CALL POSNAM(IPRE_REAL1,'NAM_AERO_CONF',GFOUND,ILUOUT0)
IF (GFOUND) READ(IPRE_REAL1,NAM_AERO_CONF)
CALL POSNAM(IPRE_REAL1,'NAM_CONFZ',GFOUND,ILUOUT0)
IF (GFOUND) READ(UNIT=IPRE_REAL1,NML=NAM_CONFZ)
-#ifdef MNH_NCWRIT
-CALL POSNAM(IPRE_REAL1,'NAM_NCOUT',GFOUND,ILUOUT0)
-IF (GFOUND) READ(UNIT=IPRE_REAL1,NML=NAM_NCOUT)
-#endif
!
!* 4.3 set soil scheme to ISBA for initialization from GRIB
!
@@ -1023,17 +1016,7 @@ END IF
!
YDESFM=ADJUSTL(ADJUSTR(CINIFILE)//'.des')
CALL WRITE_DESFM_n(1,YDESFM,CLUOUT0)
-#ifdef MNH_NCWRIT
-NC_WRITE = LNETCDF
-CALL WRITE_LFIFM_n(CINIFILE,YDAD_NAME)
-IF ( LNETCDF ) THEN
-DEF_NC=.FALSE.
-CALL WRITE_LFIFM_n(CINIFILE,YDAD_NAME)
-DEF_NC=.TRUE.
-END IF
-#else
CALL WRITE_LFIFM_n(CINIFILE,YDAD_NAME)
-#endif
!
CALL SECOND_MNH(ZTIME2)
ZWRITE = ZTIME2 - ZTIME1
@@ -1050,18 +1033,7 @@ CALL MNHREAD_ZS_DUMMY_n(YPGDFILE)
!* writing in the output file
!
COUTFMFILE=CINIFILE
-#ifdef MNH_NCWRIT
-NC_FILE='sf1'
-NC_WRITE=LNETCDF
-CALL MNHWRITE_ZS_DUMMY_n(CPROGRAM)
-IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL MNHWRITE_ZS_DUMMY_n(CPROGRAM)
-DEF_NC=.TRUE.
-END IF
-#else
CALL MNHWRITE_ZS_DUMMY_n(CPROGRAM)
-#endif
!
CALL DEALLOCATE_MODEL1(3)
!
diff --git a/src/MNH/prep_surf_mnh.f90 b/src/MNH/prep_surf_mnh.f90
index f3c604ff9..d19845c7b 100644
--- a/src/MNH/prep_surf_mnh.f90
+++ b/src/MNH/prep_surf_mnh.f90
@@ -46,6 +46,7 @@ END MODULE MODI_PREP_SURF_MNH
!! -------------
!! Original 01/2004
!! 06/2016 (G.Delautier) phasage surfex 8
+!! P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
!------------------------------------------------------------------
!
@@ -62,11 +63,6 @@ USE MODI_WRITE_SURF_ATM_N
USE MODI_WRITE_DIAG_SURF_ATM_N
USE MODD_MNH_SURFEX_n
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
-!
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -102,23 +98,8 @@ CALL INIT_PGD_SURF_ATM(YSURF_CUR,'MESONH','PRE',HATMFILE,YATMFILETYPE, &
TDTCUR%TDATE%YEAR, TDTCUR%TDATE%MONTH, &
TDTCUR%TDATE%DAY, TDTCUR%TIME )
CALL PREP_SURF_ATM(YSURF_CUR,'MESONH',HATMFILE,YATMFILETYPE,HATMFILE,YATMFILETYPE)
-#ifdef MNH_NCWRIT
-NC_WRITE=LNETCDF
-NC_FILE='sf2'
-CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','PRE',.FALSE.)
-CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','PRE')
-IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','PRE',.FALSE.)
- CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','PRE')
- DEF_NC=.TRUE.
- NC_WRITE = .FALSE.
-END IF
-#else
CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','PRE',.FALSE.)
CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','PRE')
-#endif
-
!
!----------------------------------------------------------
!
diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90
index f01402871..105e3fc1d 100644
--- a/src/MNH/read_exsegn.f90
+++ b/src/MNH/read_exsegn.f90
@@ -274,7 +274,7 @@ END MODULE MODI_READ_EXSEG_n
!! Modification 09/2009 (J.Escobar) add more info on relaxation problems
!! Modification 09/2011 (J.Escobar) re-add 'ZRESI' choose
!! Modification 12/2011 (C.Lac) Adaptation to FIT temporal scheme
-!! Modification 12/2012 (S.Bielli) add NAM_NCOUT for netcdf output
+!! Modification 12/2012 (S.Bielli) add NAM_NCOUT for netcdf output (removed 08/07/2016)
!! Modification 02/2012 (Pialat/Tulet) add ForeFire
!! Modification 02/2012 (T.Lunet) add of new Runge-Kutta methods
!! Modification 01/2015 (C. Barthe) add explicit LNOx
@@ -282,6 +282,7 @@ END MODULE MODI_READ_EXSEG_n
!! M.Leriche 18/12/2015 : bug chimie glace dans prep_real_case
!! Modification 01/2016 (JP Pinty) Add LIMA
!! Modification 02/2016 (M.Leriche) treat gas and aq. chemicals separately
+!! P.Wautelet 08/07/2016 : removed MNH_NCWRIT define
!! Modification 10/2016 (C.LAC) Add OSPLIT_WENO + Add droplet
!! deposition + Add max values
!!------------------------------------------------------------------------------
@@ -294,11 +295,6 @@ USE MODD_CONFZ
USE MODD_CONF_n, ONLY : CSTORAGE_TYPE
USE MODD_VAR_ll, ONLY: NPROC
!
-#ifdef MNH_NCWRIT
-USE MODD_NCOUT
-USE MODN_NCOUT
-#endif
-!
USE MODN_BUDGET
USE MODN_LES
USE MODN_CONF
@@ -573,10 +569,6 @@ IF (KMI == 1) THEN
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_2D_FRC)
CALL POSNAM(ILUSEG,'NAM_LATZ_EDFLX',GFOUND)
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_LATZ_EDFLX)
-#ifdef MNH_NCWRIT
- CALL POSNAM(ILUSEG,'NAM_NCOUT',GFOUND,ILUOUT)
- IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_NCOUT)
-#endif
END IF
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/read_exspa.f90 b/src/MNH/read_exspa.f90
index ee29d054f..48cf1d5ef 100644
--- a/src/MNH/read_exspa.f90
+++ b/src/MNH/read_exspa.f90
@@ -95,7 +95,8 @@ END MODULE MODI_READ_EXSPA
!! Modification 15/10/01 (I.Mallet) allow namelists in different orders
!! Modification 08/04/04 (G.Jaubert) spawning 1 for anelastic balance only
!! Modification 07/07/05 (D.Barbary) spawn with 2 input files (father+son1)
-!! Modification 30/03/12 (S.Bielli) add NAM_NCOUT for netcdf output
+!! Modification 30/03/12 (S.Bielli) add NAM_NCOUT for netcdf output (removed 08/07/2016)
+!! Modification 08/07/2016 (P.Wautelet) removed MNH_NCWRIT define
!
!-------------------------------------------------------------------------------
!
@@ -111,9 +112,6 @@ USE MODE_POS
USE MODE_MODELN_HANDLER
!
USE MODN_CONFIO
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-#endif
!
IMPLICIT NONE
!
@@ -227,10 +225,6 @@ CINIFILEPGD_n=CINIFILEPGD
CALL POSNAM(ILUSPA,'NAM_CONFIO',GFOUND,ILUOUT)
IF (GFOUND) READ(ILUSPA,NAM_CONFIO)
CALL SET_CONFIO_ll(LCDF4, LLFIOUT, LLFIREAD)
-#ifdef MNH_NCWRIT
-CALL POSNAM(ILUSPA,'NAM_NCOUT',GFOUND,ILUOUT)
-IF (GFOUND) READ(ILUSPA,NAM_NCOUT)
-#endif
CALL CLOSE_ll(YEXSPA)
!
!
diff --git a/src/MNH/spawn_model2.f90 b/src/MNH/spawn_model2.f90
index 2f2cd02fd..05c0ff7bc 100644
--- a/src/MNH/spawn_model2.f90
+++ b/src/MNH/spawn_model2.f90
@@ -187,6 +187,7 @@ END MODULE MODI_SPAWN_MODEL2
!! Modification 05/02/2015 (M.Moge) parallelization of SPAWNING
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! J.Escobar 02/05/2016 : test ZZS_MAX in //
+!! P.Wautelet 08/07/2016 : removed MNH_NCWRIT define
!! J.Escobar 12/07/2016 : add test on NRIMY & change the one on NRIMX with >=
!! Modification 01/2016 (JP Pinty) Add LIMA
!! 10/2016 (C.Lac) Add droplet deposition
@@ -264,10 +265,6 @@ USE MODE_THERMO
!
USE MODI_SECOND_MNH
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
! Modules for EDDY_FLUX
USE MODD_LATZ_EDFLX
USE MODD_DEF_EDDY_FLUX_n
@@ -1458,17 +1455,7 @@ ELSE
CDAD_NAME(2)=CMY_NAME(1) ! model 1 becomes the DAD of model 2 (spawned one)
ENDIF
!
-#ifdef MNH_NCWRIT
-NC_WRITE = LNETCDF
-CALL WRITE_LFIFM_n(CMY_NAME(2),CDAD_NAME(2))
-IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_LFIFM_n(CMY_NAME(2),CDAD_NAME(2))
- DEF_NC=.TRUE.
-END IF
-#else
CALL WRITE_LFIFM_n(CMY_NAME(2),CDAD_NAME(2))
-#endif
!
CALL SECOND_MNH(ZTIME2)
!
diff --git a/src/MNH/spawn_surf.f90 b/src/MNH/spawn_surf.f90
index 417e96753..9f09b236d 100644
--- a/src/MNH/spawn_surf.f90
+++ b/src/MNH/spawn_surf.f90
@@ -66,6 +66,7 @@ END MODULE MODI_SPAWN_SURF
!!
!! Original 01/2004
!! 06/2016 (G.Delautier) phasage surfex 8
+!! P.Wautelet 08/07/2016 : removed MNH_NCWRIT define
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -98,10 +99,6 @@ USE MODI_PREP_SURF_ATM
USE MODI_WRITE_DIAG_SURF_ATM_N
USE MODD_MNH_SURFEX_n
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
!
IMPLICIT NONE
!
@@ -141,41 +138,15 @@ IF (CSURF=='EXTE') THEN
CALL ZOOM_PGD_SURF_ATM(YSURF_CUR,'MESONH',HINIFILEPGD,'MESONH',CPGDFILE,'MESONH')
CALL MNHPUT_ZS_n
!* writing of physiographic fields in the file
-#ifdef MNH_NCWRIT
- NC_WRITE=LNETCDF
- NC_FILE='pgd'
CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
- DEF_NC=.TRUE.
- NC_WRITE = .FALSE.
- END IF
-#else
- CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH')
-#endif
!* rereading of physiographic fields and definition of prognostic fields
CALL INIT_PGD_SURF_ATM(YSURF_CUR,'MESONH','PRE',HINIFILE,'MESONH', &
TDTCUR%TDATE%YEAR, TDTCUR%TDATE%MONTH, &
TDTCUR%TDATE%DAY, TDTCUR%TIME )
CALL PREP_SURF_ATM(YSURF_CUR,'MESONH',HINIFILE,'MESONH',HINIFILEPGD,'MESONH')
!* writing of all surface fields
-#ifdef MNH_NCWRIT
- NC_WRITE=LNETCDF
- NC_FILE='sf2'
- CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
- CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
- IF ( LNETCDF ) THEN
- DEF_NC=.FALSE.
- CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
- CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
- DEF_NC=.TRUE.
- NC_WRITE = .FALSE.
- END IF
-#else
CALL WRITE_SURF_ATM_n(YSURF_CUR,'MESONH','ALL',.FALSE.)
CALL WRITE_DIAG_SURF_ATM_n(YSURF_CUR,'MESONH','ALL')
-#endif
!
ELSE
CSURF='EXRM'
diff --git a/src/MNH/write_lfifm1_for_diag_supp.f90 b/src/MNH/write_lfifm1_for_diag_supp.f90
index d5c384c11..05827e476 100644
--- a/src/MNH/write_lfifm1_for_diag_supp.f90
+++ b/src/MNH/write_lfifm1_for_diag_supp.f90
@@ -83,6 +83,7 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG_SUPP
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! P.Tulet : Diag for salt and orilam
!! J.-P. Chaboureau 07/03/2016 fix the dimensions of local arrays
+!! P.Wautelet : 11/07/2016 : removed MNH_NCWRIT define
!! J.-P. Chaboureau 31/10/2016 add the call to RTTOV11
!! F. Brosse 10/2016 add chemical production destruction terms outputs
!-------------------------------------------------------------------------------
@@ -152,11 +153,6 @@ USE MODE_FMWRIT
!
USE MODI_GET_SURF_UNDEF
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-use mode_util
-#endif
-!
IMPLICIT NONE
!
!* 0.1 Declarations of arguments
@@ -223,21 +219,21 @@ ALLOCATE(ZWORK31(IIU,IJU,IKU))
ALLOCATE(ZTEMP(IIU,IJU,IKU))
ZTEMP(:,:,:)=XTHT(:,:,:)*(XPABST(:,:,:)/ XP00) **(XRD/XCPD)
!
-#ifdef MNH_NCWRIT
-IF (LNETCDF.AND..NOT.LCARTESIAN) THEN
- YRECFM='LAT'
- YCOMMENT='X_Y_latitude (degree)'
- IGRID=1
- ILENCH=LEN(YCOMMENT)
- CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLAT,IGRID,ILENCH,YCOMMENT,IRESP)
-!
- YRECFM='LON'
- YCOMMENT='X_Y_longitude (degree)'
- IGRID=1
- ILENCH=LEN(YCOMMENT)
- CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLON,IGRID,ILENCH,YCOMMENT,IRESP)
-END IF
-#endif
+! #ifdef MNH_NCWRIT
+! IF (LNETCDF.AND..NOT.LCARTESIAN) THEN
+! YRECFM='LAT'
+! YCOMMENT='X_Y_latitude (degree)'
+! IGRID=1
+! ILENCH=LEN(YCOMMENT)
+! CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLAT,IGRID,ILENCH,YCOMMENT,IRESP)
+! !
+! YRECFM='LON'
+! YCOMMENT='X_Y_longitude (degree)'
+! IGRID=1
+! ILENCH=LEN(YCOMMENT)
+! CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLON,IGRID,ILENCH,YCOMMENT,IRESP)
+! END IF
+! #endif
!
!-------------------------------------------------------------------------------
!
diff --git a/src/MNH/write_lfifmn_fordiachron.f90 b/src/MNH/write_lfifmn_fordiachron.f90
index 3f59602ab..4ca7f4acb 100644
--- a/src/MNH/write_lfifmn_fordiachron.f90
+++ b/src/MNH/write_lfifmn_fordiachron.f90
@@ -81,6 +81,7 @@
!! October 2009 (G. Tanguy) add ILENCH=LEN(YCOMMENT) after
!! change of YCOMMENT
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! P.Wautelet: 11/07/2016 : removed MNH_NCWRIT define
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -104,10 +105,6 @@ USE MODE_FMWRIT
USE MODE_GRIDPROJ
USE MODE_ll
USE MODI_GATHER_ll
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
!
IMPLICIT NONE
!
@@ -280,23 +277,23 @@ IF (.NOT.LCARTESIAN) THEN
ILENCH=LEN(YCOMMENT)
CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'--',ZLATOR,IGRID,ILENCH,YCOMMENT,IRESP)
!
-#ifdef MNH_NCWRIT
- IF (LNETCDF) THEN
- LLFIFM = .FALSE.
- YRECFM='LAT'
- YCOMMENT='X_Y_latitude (degree)'
- IGRID=1
- ILENCH=LEN(YCOMMENT)
- CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLAT,IGRID,ILENCH,YCOMMENT,IRESP)
-
- YRECFM='LON'
- YCOMMENT='X_Y_longitude (degree)'
- IGRID=1
- ILENCH=LEN(YCOMMENT)
- CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLON,IGRID,ILENCH,YCOMMENT,IRESP)
- LLFIFM = .TRUE.
- END IF
-#endif
+! #ifdef MNH_NCWRIT
+! IF (LNETCDF) THEN
+! LLFIFM = .FALSE.
+! YRECFM='LAT'
+! YCOMMENT='X_Y_latitude (degree)'
+! IGRID=1
+! ILENCH=LEN(YCOMMENT)
+! CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLAT,IGRID,ILENCH,YCOMMENT,IRESP)
+!
+! YRECFM='LON'
+! YCOMMENT='X_Y_longitude (degree)'
+! IGRID=1
+! ILENCH=LEN(YCOMMENT)
+! CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLON,IGRID,ILENCH,YCOMMENT,IRESP)
+! LLFIFM = .TRUE.
+! END IF
+! #endif
END IF
!
YRECFM='THINSHELL'
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index b982a8a35..3c199c84e 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -164,6 +164,7 @@ END MODULE MODI_WRITE_LFIFM_n
!! J.escobar 04/08/2015 suit Pb with writ_lfin JSA increment , modif in ini_nsv to have good order initialization
!! Modification 01/2016 (JP Pinty) Add LIMA
!! M.Mazoyer 04/16 : Add supersaturation fields
+!! P.Wautelet 11/07/2016 removed MNH_NCWRIT define
!!
!-------------------------------------------------------------------------------
!
@@ -244,11 +245,6 @@ USE MODI_DUSTLFI_n
USE MODI_SALTLFI_n
USE MODI_CH_AER_REALLFI_n
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-USE MODE_UTIL
-#endif
-!
!20131128
USE MODE_MPPDB
USE MODE_EXTRAPOL
@@ -507,33 +503,18 @@ YCOMMENT='height level without orography (METERS)'
IGRID=4
ILENCH=LEN(YCOMMENT)
CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,YDIR,XZHAT,IGRID,ILENCH,YCOMMENT,IRESP)
-#ifdef MNH_NCWRIT
-IF (LNETCDF.AND..NOT.LCARTESIAN) THEN
- LLFIFM = .FALSE.
- YRECFM='LAT'
- YCOMMENT='X_Y_latitude (degree)'
- IGRID=1
- ILENCH=LEN(YCOMMENT)
- CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLAT,IGRID,ILENCH,YCOMMENT,IRESP)
-
- YRECFM='LON'
- YCOMMENT='X_Y_longitude (degree)'
- IGRID=1
- ILENCH=LEN(YCOMMENT)
- CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XLON,IGRID,ILENCH,YCOMMENT,IRESP)
- LLFIFM = .TRUE.
-END IF
-!
-!*SB*MAY2012
-!*SB* * WRITE ALT
-IF (LNETCDF) THEN
- YRECFM='ALT'
- YCOMMENT='X_Y_Z_ALTitude (M)'
- IGRID=4
- ILENCH=LEN(YCOMMENT)
- CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XZZ,IGRID,ILENCH,YCOMMENT,IRESP)
-END IF
-#endif
+! #ifdef MNH_NCWRIT
+! !
+! !*SB*MAY2012
+! !*SB* * WRITE ALT
+! IF (LNETCDF) THEN
+! YRECFM='ALT'
+! YCOMMENT='X_Y_Z_ALTitude (M)'
+! IGRID=4
+! ILENCH=LEN(YCOMMENT)
+! CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,'XY',XZZ,IGRID,ILENCH,YCOMMENT,IRESP)
+! END IF
+! #endif
IF (.NOT.LCARTESIAN) THEN
YRECFM='LAT'
YCOMMENT='X_Y_latitude (degree)'
diff --git a/src/MNH/write_seriesn.f90 b/src/MNH/write_seriesn.f90
index d2c5ac3a6..c319f191a 100644
--- a/src/MNH/write_seriesn.f90
+++ b/src/MNH/write_seriesn.f90
@@ -59,6 +59,7 @@ END MODULE MODI_WRITE_SERIES_n
!! Original 4/03/2002
!! Modification 7/01/2013 Add key for netcdf writing
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!! P.Wautelet: 11/07/2016 : removed MNH_NCWRIT define
!!
!-------------------------------------------------------------------------------
!
@@ -74,10 +75,6 @@ USE MODI_WRITE_DIACHRO
USE MODI_GATHER_ll
USE MODE_ll
USE MODE_IO_ll
-#ifdef MNH_NCWRIT
- USE MODE_DIMLIST
- USE MODE_UTIL
-#endif
!
IMPLICIT NONE
!
@@ -149,9 +146,6 @@ IF (LMASKLANDSEA) ISER=3
!
!* 2.1 Average processes of temporal series
!
-#ifdef MNH_NCWRIT
-IF (DEF_NC) THEN
-#endif
ALLOCATE(ZVAR2D(NSNBSTEPT,NAVER1))
IF (LSERIES1) THEN
ZVAR2D(:,:)=XSSERIES1(1,1,1,1:NSNBSTEPT,1,1:NAVER1)
@@ -251,9 +245,6 @@ IF (LWMINMAX) THEN
!
DEALLOCATE(ZVAR3D,ZVAR3D_ll)
ENDIF
-#ifdef MNH_NCWRIT
-ENDIF
-#endif
!
!* 2.3 Write in diachro file
!
@@ -271,9 +262,6 @@ CALL WRITE_DIACHRO(HFILEDIA,HLUOUT,'TSERIES','CART',NSGRIDD1,XSDATIME(:,1:NSNBST
!
!* 3.1 Average processes of temporal series
!
-#ifdef MNH_NCWRIT
-IF (DEF_NC) THEN
-#endif
ALLOCATE(ZVAR3D(IKMAX,NSNBSTEPT,NSTEMP_SERIE2))
!
IF (LSERIES2) THEN
@@ -318,9 +306,6 @@ IF (LMASKLANDSEA) THEN
XSSERIES2(1,1,1:IKMAX,1:NSNBSTEPT,1,2*INAV+1:NSTEMP_SERIE2)=ZVAR3D(:,:,2*INAV+1:NSTEMP_SERIE2)/MAX(ZSIZEHB,1.)
END IF
DEALLOCATE(ZVAR3D)
-#ifdef MNH_NCWRIT
-END IF
-#endif
!
!* 3.2 Write in diachro file
!
diff --git a/src/MNH/zoom_pgd.f90 b/src/MNH/zoom_pgd.f90
index ee07ef56a..82f6325a2 100644
--- a/src/MNH/zoom_pgd.f90
+++ b/src/MNH/zoom_pgd.f90
@@ -43,6 +43,7 @@
!! 10/10/2011 J.Escobar call INI_PARAZ_ll
!! 30/03/2012 S.Bielli Add NAM_NCOUT
!! 06/2016 (G.Delautier) phasage surfex 8
+!! 08/07/2016 P.Wautelet Removed MNH_NCWRIT define
!!
!----------------------------------------------------------------------------
!
@@ -77,9 +78,6 @@ USE MODI_ZOOM_PGD_SURF_ATM
USE MODI_WRITE_PGD_SURF_ATM_N
USE MODD_MNH_SURFEX_n
!
-#ifdef MNH_NCWRIT
-USE MODN_NCOUT
-#endif
USE MODN_CONFIO
!
IMPLICIT NONE
@@ -141,10 +139,6 @@ YZOOMFILE = ''
YZOOMNBR = '00'
CALL POSNAM(ILUNAM,'NAM_PGDFILE',GFOUND,ILUOUT0)
IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_PGDFILE)
-#ifdef MNH_NCWRIT
-CALL POSNAM(ILUNAM,'NAM_NCOUT',GFOUND,ILUOUT0)
-IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_NCOUT)
-#endif
CALL POSNAM(ILUNAM,'NAM_CONFIO',GFOUND,ILUOUT0)
IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONFIO)
CALL SET_CONFIO_ll(LCDF4, LLFIOUT, LLFIREAD)
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index ea570334c..dbff3238b 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -205,12 +205,6 @@ VPATH += $(DIR_NEWLFI)
#ARCH_XYZ := $(ARCH_XYZ)-$(VER_NEWLFI)
endif
##########################################################
-# Source NCWRIT #
-##########################################################
-ifdef MNH_NCWRIT
-CPPFLAGS_MNH += -DMNH_NCWRIT=${MNH_NCWRIT}
-endif
-##########################################################
# Source FOREFIRE #
##########################################################
ifdef MNH_FOREFIRE
--
GitLab