diff --git a/src/MNH/open_nestpgd_files.f90 b/src/MNH/open_nestpgd_files.f90 index e3572c03dd0f41d50147301cb75862d271ee17fb..8feb06558da6c24a13244196827b795ca359fde3 100644 --- a/src/MNH/open_nestpgd_files.f90 +++ b/src/MNH/open_nestpgd_files.f90 @@ -87,7 +87,8 @@ USE MODN_NCOUT #endif 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 ! @@ -119,6 +120,7 @@ INTEGER :: IDAD ! father of one model INTEGER :: JPGD ! loop counter LOGICAL :: GADD ! CHARACTER(LEN=21), DIMENSION(JPMODELMAX) :: YSHORTPGD +INTEGER :: NHALO_MNH ! !* 0.3 Declaration of namelists ! ------------------------ @@ -164,7 +166,11 @@ CALL OPEN_ll(UNIT=IPRE_NEST_PGD,FILE=HPRE_NEST_PGD,IOSTAT=IRESP,FORM='FORMATTED' ! !JUAN 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 ! !------------------------------------------------------------------------------- diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90 index ecf2a61461e4943bcfdf60fbfb95d97574960cdb..be54707adea52b2ed84d1111017c3db405a2af41 100644 --- a/src/MNH/prep_pgd.f90 +++ b/src/MNH/prep_pgd.f90 @@ -83,7 +83,8 @@ USE MODI_ZSMT_PGD ! !JUAN 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 USE MODN_CONFIO ! @@ -134,6 +135,7 @@ INTEGER :: ILENCH ! length of comment string CHARACTER(LEN=100):: YCOMMENT ! comment string INTEGER :: IIMAX, IJMAX !#endif +INTEGER :: NHALO_MNH ! NAMELIST/NAM_PGDFILE/CPGDFILE, NHALO NAMELIST/NAM_ZSFILTER/NZSFILTER @@ -180,7 +182,11 @@ IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_SLEVE) CALL POSNAM(ILUNAM,'NAM_CONFZ',GFOUND) IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONFZ) 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 CALL POSNAM(ILUNAM,'NAM_CONFIO',GFOUND) IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_CONFIO)