Merge branch 'MNH-54X' into MNH-54X-dev-IO

src/MNH/flash_geom_elec.f90

@@ -84,6 +84,8 @@ END MODULE MODI_FLASH_GEOM_ELEC_n
 !!      J.Escobar : 18/12/2015 : Correction of bug in bound in // for NHALO <>1 
 !!      J.Escobar : 28/03/2018 : Correction of multiple // bug & compiler indepedent mnh_random_number
 !!      J.Escobar : 20/06/2018 : Correction of computation of global index I8VECT
+!!      J.Escobar : 10/12/2018 : // Correction , mpi_bcast CG & CG_POS parameter 
+!!                               & initialize INBLIGHT on all proc for filling/saving AREA* arrays
 !!
 !-------------------------------------------------------------------------------
 !
@@ -1141,11 +1143,8 @@ ENDIF
 !*              Save the particule charge and total pos/neg charge neutralization points.
 !*                   the coordinates of all flash branch points
 !
-          INBSEG_PROC(IPROC+1) = INBSEG(IL)
-          DO IK = 0, NPROC-1
-            CALL MPI_BCAST (INBSEG_PROC(IK+1), 1, MPI_INTEGER, IK,  &
-                            NMNH_COMM_WORLD, IERR)
-          END DO
+          CALL MPI_ALLGATHER(INBSEG(IL), 1, MPI_INTEGER, &
+                             INBSEG_PROC,  1, MPI_INTEGER, NMNH_COMM_WORLD, IERR)
 
           INBSEG_ALL(IL) = INBSEG(IL)
           CALL SUM_ELEC_ll(INBSEG_ALL(IL))
@@ -1228,8 +1227,8 @@ ENDIF
 ! Synchronizing all processes
 !   CALL MPI_BARRIER(NMNH_COMM_WORLD, IERR)   ! A ACTIVER SI PB.
 !
+    INBLIGHT = COUNT(GNEW_FLASH(1:INB_CELL))
     IF (IPROC .EQ. 0) THEN
-      INBLIGHT = COUNT(GNEW_FLASH(1:INB_CELL))
       IF (INBLIGHT .NE. 0) THEN
         IF ((NNBLIGHT+INBLIGHT) .LE. NFLASH_WRITE) THEN       ! SAVE
           ISAVE_STATUS = 1
@@ -1882,6 +1881,16 @@ CALL MPI_BCAST (ISEG_LOC(:,IL), 3*SIZE(PRT,3), &
                 MPI_INTEGER, IPROC_TRIG(IL), NMNH_COMM_WORLD, IERR)
 CALL MPI_BCAST (ITYPE(IL), 1, &
                 MPI_INTEGER, IPROC_TRIG(IL), NMNH_COMM_WORLD, IERR)
+
+CALL MPI_BCAST (GCG, 1, &
+                MPI_LOGICAL, IPROC_TRIG(IL), NMNH_COMM_WORLD, IERR)
+CALL MPI_BCAST (GCG_POS, 1, &
+                MPI_LOGICAL, IPROC_TRIG(IL), NMNH_COMM_WORLD, IERR)
+CALL MPI_BCAST (NNB_CG, 1, &
+                MPI_INTEGER, IPROC_TRIG(IL), NMNH_COMM_WORLD, IERR)
+CALL MPI_BCAST (NNB_CG_POS, 1, &
+                MPI_INTEGER, IPROC_TRIG(IL), NMNH_COMM_WORLD, IERR)
+
 !
 CALL MPPDB_CHECK3DM("flash:: one_leader end ZFLASH",PRECISION,ZFLASH(:,:,:,IL))
 !

src/SURFEX/mode_read_grib.F90

@@ -406,8 +406,6 @@ SELECT CASE (HINMODEL)
     CALL READ_GRIB(HGRIB,KLUOUT,172,IRET,PMASK) 
   CASE ('NCEP  ')
     CALL READ_GRIB(HGRIB,KLUOUT,172,IRET,PMASK) 
-
-
   CASE ('ARPEGE','ALADIN','MOCAGE')
     CALL READ_GRIB(HGRIB,KLUOUT,81,IRET,PMASK)          
   CASE ('HIRLAM')        
@@ -651,6 +649,9 @@ END SUBROUTINE READ_GRIB_SST
       SUBROUTINE READ_GRIB_TSWATER(HGRIB,KLUOUT,HINMODEL,PMASK,PTS)
 !     ###########################
 !
+!    MODIFICATIONS
+!    Julien Pergaud(via J.Escobar) 10/2018 : correction for GFS undef=9999. temperature values
+!
 USE MODD_SURF_PAR,   ONLY : XUNDEF
 !
 IMPLICIT NONE
@@ -676,7 +677,7 @@ SELECT CASE (HINMODEL)
      CALL ABOR1_SFX('MODE_READ_GRIB:READ_GRIB_TSWATER:OPTION NOT SUPPORTED '//HINMODEL)    
 END SELECT
 !
-IF (SIZE(PMASK)==SIZE(PTS)) WHERE (PMASK(:)/=1.) PTS = XUNDEF
+IF (SIZE(PMASK)==SIZE(PTS)) WHERE ((PMASK(:)/=1.) .OR. ((PMASK(:)==1.) .AND.(PTS(:)==9999.))) PTS = XUNDEF
 !
 IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:READ_GRIB_TSWATER',1,ZHOOK_HANDLE)
 END SUBROUTINE READ_GRIB_TSWATER
@@ -741,6 +742,9 @@ END SUBROUTINE READ_GRIB_T2
       SUBROUTINE READ_GRIB_T2_LAND(HGRIB,KLUOUT,HINMODEL,PMASK,ZFIELD)
 !     ###########################
 !
+!    MODIFICATIONS
+!    Julien Pergaud(via J.Escobar) 10/2018 : correction for GFS undef=9999. temperature values
+!
 USE MODD_SURF_PAR,   ONLY : XUNDEF
 !
 IMPLICIT NONE
@@ -758,7 +762,7 @@ IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:READ_GRIB_T2_LAND',0,ZHOOK_HANDLE)
 !
  CALL READ_GRIB_T2(HGRIB,KLUOUT,HINMODEL,PMASK,ZFIELD)
 !
-IF (SIZE(PMASK)==SIZE(ZFIELD)) WHERE (PMASK(:)/=1.) ZFIELD = XUNDEF
+IF (SIZE(PMASK)==SIZE(ZFIELD)) WHERE ((PMASK(:)/=1.) .OR. ((PMASK(:)==1.) .AND.(ZFIELD(:)==9999.))) ZFIELD = XUNDEF
 !
 IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:READ_GRIB_T2_LAND',1,ZHOOK_HANDLE)
 END SUBROUTINE READ_GRIB_T2_LAND
@@ -802,6 +806,9 @@ END SUBROUTINE PUT_LAYER_DEPTH
       SUBROUTINE FILL_PFIELD(KLUOUT,HROUT,KNLAYERDEEP,PDIN,PFIELDIN,PMASK,PFIELDOUT,PDOUT)
 !     #######################
 !
+!    MODIFICATIONS
+!    Julien Pergaud(via J.Escobar) 10/2018 : correction for GFS undef=9999. temperature values
+!
 USE MODD_SURF_PAR,   ONLY : XUNDEF
 !
 IMPLICIT NONE
@@ -836,9 +843,10 @@ DO JL=1,KNLAYERDEEP
   PDOUT(:,JL)=SUM(PDIN(1:JL))
   PFIELDOUT(:,JL)=PFIELDIN(:,JL)
   IF (SIZE(PMASK)==SIZE(PFIELDOUT,1)) &
-    WHERE (PMASK(:)/=1.) PFIELDOUT(:,JL) = XUNDEF
+    WHERE ((PMASK(:)/=1.) .OR. ((PMASK(:)==1.) .AND.(PFIELDOUT(:,JL)==9999.))) PFIELDOUT(:,JL) = XUNDEF
 ENDDO
 !
+
 IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:FILL_PFIELD',1,ZHOOK_HANDLE)
 END SUBROUTINE FILL_PFIELD
 !-------------------------------------------------------------------
@@ -2305,7 +2313,7 @@ REAL, DIMENSION(:,:), POINTER       :: PD        ! thickness of each layer
 !* local variables
 !  ---------------
 INTEGER(KIND=kindOfInt)                           :: IRET      ! return code
-INTEGER                           :: ILTYPE    ! type of level (Grib code table 3)
+INTEGER                           :: ILTYPE,ITER    ! type of level (Grib code table 3)
 INTEGER                           :: ILEV1     ! level definition
 INTEGER                           :: ILEV2     ! level definition
 INTEGER                           :: JL         ! layer loop counter
@@ -2335,6 +2343,8 @@ ZLEV1= 0.0
 ZLEV2= 0.1
 CALL READ_GRIB(HGRIB,KLUOUT,228139,IRET,ZFIELD,KLTYPE=ILTYPE,KLEV1=ILEV1,KLEV2=ILEV2,HTYPELEVEL=YTYPELEVEL,PLEV1=ZLEV1,PLEV2=ZLEV2)
 !
+
+
 IF (IRET== 0) THEN
   ZD(1)=(ZLEV2 - ZLEV1)
 
@@ -2356,6 +2366,7 @@ ZLEV2= 2.0
 !
 CALL READ_GRIB(HGRIB,KLUOUT,228139,IRET,ZFIELD,KLTYPE=ILTYPE,KLEV1=ILEV1,KLEV2=ILEV2,HTYPELEVEL=YTYPELEVEL,PLEV1=ZLEV1,PLEV2=ZLEV2)
 
+
 IF (IRET == 0) THEN
   INLAYERDEEP = 4
   ZD(4)=(ZLEV2 - ZLEV1)
@@ -2377,6 +2388,7 @@ ZLEV2= 1.0
 
  CALL READ_GRIB(HGRIB,KLUOUT,228139,IRET,ZFIELD,KLTYPE=ILTYPE,KLEV1=ILEV1,KLEV2=ILEV2,HTYPELEVEL=YTYPELEVEL,PLEV1=ZLEV1,PLEV2=ZLEV2)
 !
+
 IF (IRET == 0) THEN      
   ZD(3)=(ZLEV2 - ZLEV1)
   ZTG(:,3)=ZFIELD 
@@ -2394,6 +2406,8 @@ ZLEV1= 0.1
 ZLEV2= 0.4
  CALL READ_GRIB(HGRIB,KLUOUT,228139,IRET,ZFIELD,KLTYPE=ILTYPE,KLEV1=ILEV1,KLEV2=ILEV2,HTYPELEVEL=YTYPELEVEL,PLEV1=ZLEV1,PLEV2=ZLEV2)
 !
+
+
 IF (IRET== 0) THEN 
   ZD(2)=(ZLEV2 - ZLEV1)   
   ZTG(:,2)=ZFIELD
@@ -2414,7 +2428,6 @@ IF(SUM(ZD(1:INLAYERDEEP)) < 3.) THEN
   write(KLUOUT,'(a,i3,i3)') 'editionNumber MAKE_GRIB_INDEX',INLAYERDEEP
 
   ZD(INLAYERDEEP)=3.-SUM(ZD(1:INLAYERDEEP-1))
-  write(KLUOUT,*) 'ZD',ZD
 
   ZTG(:,INLAYERDEEP)=ZTG(:,INLAYERDEEP-1)
 ENDIF
@@ -2431,7 +2444,7 @@ WRITE  (KLUOUT,'(A)') 'MODE_READ_GRIB: FILL PROFILE'
 DEALLOCATE(ZD)
 DEALLOCATE(ZTG)
 !
-!write(KLUOUT,*) 'OUT FILL ZD',PD,PTG
+
 
 IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:READ_GRIB_TG_NCEP',1,ZHOOK_HANDLE)