Merge branch 'MNH-55X-dev-OPENACC' into MNH-55X-dev-OPENACC-FFT

src/LIB/SURCOUCHE/src/mode_io_file.f90

@@ -590,6 +590,7 @@ SELECT CASE(TPFILE%CTYPE)
 #ifdef MNH_IOCDF4
 !Remark: IO_Coordvar_write_nc4 disabled (for the moment) for Z-split files
 !        because it introduce a serialization due to MPI communications inside the call
+!        WARNING: if uncommented, please modify IO_Coordvar_write_nc4 to enable block concerning gdealloc
 !       !Write coordinates variables in netCDF file
 !       IF (TZFILE_IOZ%CMODE == 'WRITE' .AND. (TZFILE_IOZ%CFORMAT=='NETCDF4' .OR. TZFILE_IOZ%CFORMAT=='LFICDF4')) THEN
 !         CALL IO_Coordvar_write_nc4(TZFILE_IOZ,HPROGRAM_ORIG=HPROGRAM_ORIG)

src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90

@@ -1596,6 +1596,8 @@ call Write_hor_coord1d( tzdim_ni_v, 'x-dimension of the grid at v location', &
 call Write_hor_coord1d( tzdim_nj_v, 'y-dimension of the grid at v location', &
                         trim(ystdnameprefix)//'_y_coordinate_at_v_location', 'Y', -0.5, jphext, 0,      zyhat_glob  )
 
+!Warning: the following block has to be reenabled if IO_Coordvar_write_nc4 is again called for Z-split files
+#if 0
 !The z?hat*_glob were allocated in Gather_hor_coord1d calls
 !Deallocate only if it is a non Z-split file or the last Z-split subfile
 gdealloc = .false.
@@ -1604,6 +1606,9 @@ if ( Associated( tpfile%tmainfile ) ) then
 else if ( tpfile%nsubfiles_ioz == 0 .and. .not. Associated( tpfile%tmainfile ) ) then
   gdealloc = .true.
 end if
+#else
+gdealloc = .true.
+#endif
 
 if ( .not. lcartesian ) then
   !Compute latitude/longitude for the Arakawa points

src/MNH/condensation.f90

@@ -259,6 +259,11 @@ REAL, DIMENSION(-22:11),PARAMETER :: ZSRC_1D =(/                         &
 !
 !-------------------------------------------------------------------------------
 !
+YLAMBDA3 = HLAMBDA3
+
+IF( YLAMBDA3 /='CB' .AND. YLAMBDA3 /='NONE' ) &
+  call Print_msg( NVERB_FATAL, 'GEN', 'CONDENSATION', 'invalid value for YLAMBDA3: ' // TRIM( YLAMBDA3 ) )
+
 GPRESENT_PLV  = PRESENT(PLV)
 GPRESENT_PLS  = PRESENT(PLS)
 GPRESENT_PCPH = PRESENT(PCPH)
@@ -286,11 +291,6 @@ IF (MPPDB_INITIALIZED) THEN
   CALL MPPDB_CHECK3D(PRI,"CONDENSATION beg:PRI",PRECISION)
 END IF
 
-YLAMBDA3 = HLAMBDA3
-
-IF( YLAMBDA3 /='CB' .AND. YLAMBDA3 /='NONE' ) &
-  call Print_msg( NVERB_FATAL, 'GEN', 'CONDENSATION', 'invalid value for YLAMBDA3: ' // TRIM( YLAMBDA3 ) )
-
 #ifndef MNH_OPENACC
 allocate( ztlk (kiu, kju, kku ) )
 allocate( zrt  (kiu, kju, kku ) )