Skip to content
Snippets Groups Projects
Commit e91382f9 authored by ESCOBAR MUNOZ Juan's avatar ESCOBAR MUNOZ Juan Committed by WAUTELET Philippe
Browse files

Juan 18/09/2015: for gfortran bug , manage NHALO_MNH with temp variable

parent e1cdd560
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,8 @@ USE MODN_NCOUT ...@@ -87,7 +87,8 @@ USE MODN_NCOUT
#endif #endif
USE MODN_CONFIO USE MODN_CONFIO
! !
USE MODN_CONF, ONLY : JPHEXT , NHALO_MNH => NHALO USE MODD_PARAMETERS, ONLY : JPHEXT
USE MODD_CONF, ONLY : NHALO_CONF_MNH => NHALO
! !
IMPLICIT NONE IMPLICIT NONE
! !
...@@ -119,6 +120,7 @@ INTEGER :: IDAD ! father of one model ...@@ -119,6 +120,7 @@ INTEGER :: IDAD ! father of one model
INTEGER :: JPGD ! loop counter INTEGER :: JPGD ! loop counter
LOGICAL :: GADD ! LOGICAL :: GADD !
CHARACTER(LEN=21), DIMENSION(JPMODELMAX) :: YSHORTPGD CHARACTER(LEN=21), DIMENSION(JPMODELMAX) :: YSHORTPGD
INTEGER :: NHALO_MNH
! !
!* 0.3 Declaration of namelists !* 0.3 Declaration of namelists
! ------------------------ ! ------------------------
...@@ -164,7 +166,11 @@ CALL OPEN_ll(UNIT=IPRE_NEST_PGD,FILE=HPRE_NEST_PGD,IOSTAT=IRESP,FORM='FORMATTED' ...@@ -164,7 +166,11 @@ CALL OPEN_ll(UNIT=IPRE_NEST_PGD,FILE=HPRE_NEST_PGD,IOSTAT=IRESP,FORM='FORMATTED'
! !
!JUAN !JUAN
CALL POSNAM(IPRE_NEST_PGD,'NAM_CONF_NEST',GFOUND) CALL POSNAM(IPRE_NEST_PGD,'NAM_CONF_NEST',GFOUND)
IF (GFOUND) READ(UNIT=IPRE_NEST_PGD,NML=NAM_CONF_NEST) IF (GFOUND) THEN
NHALO_MNH = NHALO_CONF_MNH
READ(UNIT=IPRE_NEST_PGD,NML=NAM_CONF_NEST)
NHALO_CONF_MNH = NHALO_MNH
END IF
!JUAN !JUAN
! !
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
......
...@@ -83,7 +83,8 @@ USE MODI_ZSMT_PGD ...@@ -83,7 +83,8 @@ USE MODI_ZSMT_PGD
! !
!JUAN !JUAN
USE MODN_CONFZ USE MODN_CONFZ
USE MODN_CONF, ONLY : JPHEXT , NHALO_MNH => NHALO USE MODD_PARAMETERS, ONLY : JPHEXT
USE MODD_CONF, ONLY : NHALO_CONF_MNH => NHALO
!JUAN !JUAN
USE MODN_CONFIO USE MODN_CONFIO
! !
...@@ -134,6 +135,7 @@ INTEGER :: ILENCH ! length of comment string ...@@ -134,6 +135,7 @@ INTEGER :: ILENCH ! length of comment string
CHARACTER(LEN=100):: YCOMMENT ! comment string CHARACTER(LEN=100):: YCOMMENT ! comment string
INTEGER :: IIMAX, IJMAX INTEGER :: IIMAX, IJMAX
!#endif !#endif
INTEGER :: NHALO_MNH
! !
NAMELIST/NAM_PGDFILE/CPGDFILE, NHALO NAMELIST/NAM_PGDFILE/CPGDFILE, NHALO
NAMELIST/NAM_ZSFILTER/NZSFILTER NAMELIST/NAM_ZSFILTER/NZSFILTER
...@@ -180,7 +182,11 @@ IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_SLEVE) ...@@ -180,7 +182,11 @@ IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_SLEVE)
CALL POSNAM(ILUNAM,'NAM_CONFZ',GFOUND) CALL POSNAM(ILUNAM,'NAM_CONFZ',GFOUND)
IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONFZ) IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONFZ)
CALL POSNAM(ILUNAM,'NAM_CONF_PGD',GFOUND) CALL POSNAM(ILUNAM,'NAM_CONF_PGD',GFOUND)
IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONF_PGD) IF (GFOUND) THEN
NHALO_MNH = NHALO_CONF_MNH
READ(UNIT=ILUNAM,NML=NAM_CONF_PGD)
NHALO_CONF_MNH = NHALO_MNH
ENDIF
!JUANZ !JUANZ
CALL POSNAM(ILUNAM,'NAM_CONFIO',GFOUND) CALL POSNAM(ILUNAM,'NAM_CONFIO',GFOUND)
IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONFIO) IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONFIO)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment