Changeset 1398


Ignore:
Timestamp:
2009-04-09T19:43:00+02:00 (12 years ago)
Author:
rblod
Message:

dev_004_VVL:sync: synchro with trunk, see ticket #361

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev_004_VVL/NEMO/OPA_SRC/DIA/diaptr.F90

    r1358 r1398  
    6363 
    6464   INTEGER :: niter 
     65   INTEGER :: nidom_ptr 
    6566 
    6667   REAL(wp), DIMENSION(jpj,jpk) ::   tn_jk_glo, sn_jk_glo,  &  !: "zonal" mean temperature and salinity 
     
    494495      NAMELIST/namptr/ ln_diaptr, ln_diaznl, ln_subbas, ln_ptrcomp, nf_ptr, nf_ptr_wri 
    495496      INTEGER :: inum       ! temporary logical unit 
     497#if defined key_mpp_mpi 
    496498      INTEGER, DIMENSION (1) :: iglo, iloc, iabsf, iabsl, ihals, ihale, idid 
     499#endif 
    497500      !!---------------------------------------------------------------------- 
    498501 
     
    557560      !!---------------------------------------------------------------------- 
    558561 
     562#if defined key_mpp_mpi  
    559563      iglo (1) = jpjglo 
    560564      iloc (1) = nlcj 
     
    573577!-$$      ENDIF  
    574578 
    575       CALL flio_dom_set ( jpnj, nproc/jpni, idid, iglo, iloc, iabsf, iabsl, ihals, ihale, 'BOX', nidom) 
     579      CALL flio_dom_set ( jpnj, nproc/jpni, idid, iglo, iloc, iabsf, iabsl, ihals, ihale, 'BOX', nidom_ptr) 
     580#else 
     581      nidom_ptr = FLIO_DOM_NONE 
     582#endif 
    576583       
    577584   END SUBROUTINE dia_ptr_init 
     
    701708            ! Horizontal grid : zphi() 
    702709            CALL histbeg(clhstnam, 1, zfoo, jpj, zphi,   & 
    703                1, 1, 1, jpj, niter, zjulian, zdt*nf_ptr, nhoridz, numptr, domain_id=nidom) 
     710               1, 1, 1, jpj, niter, zjulian, zdt*nf_ptr, nhoridz, numptr, domain_id=nidom_ptr) 
    704711            ! Vertical grids : gdept_0, gdepw_0 
    705712            CALL histvert( numptr, "deptht", "Vertical T levels",   & 
Note: See TracChangeset for help on using the changeset viewer.