Changeset 13236


Ignore:
Timestamp:
2020-07-03T10:54:32+02:00 (5 weeks ago)
Author:
smasson
Message:

dev_r12558_HPC-08_epico_Extra_Halo: fix merge with trunk@13218, see #2366

Location:
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/NST/agrif_user.F90

    r13229 r13236  
    551551 
    552552      IF( ln_zdftke.OR.ln_zdfgls ) CALL Agrif_Set_bc( avm_id, (/0,ind1/) ) 
    553       CALL Agrif_Set_bc(glamt_id, (/0,ind1-1/) )   
    554       CALL Agrif_Set_bc(gphit_id, (/0,ind1-1/) )   
     553!!$      CALL Agrif_Set_bc(glamt_id, (/0,ind1-1/) )   
     554!!$      CALL Agrif_Set_bc(gphit_id, (/0,ind1-1/) )   
    555555 
    556556      ! 4. Update type 
     
    884884      ! 
    885885      ! Set the number of ghost cells according to periodicity 
    886       nbghostcells_x = nbghostcells 
     886      nbghostcells_x   = nbghostcells 
    887887      nbghostcells_y_s = nbghostcells 
    888888      nbghostcells_y_n = nbghostcells 
    889889      ! 
    890       IF ( jperio == 1 ) nbghostcells_x = 0 
     890      IF (   jperio == 1  ) nbghostcells_x  = 0 
    891891      IF ( .NOT. lk_south ) nbghostcells_y_s = 0 
    892  
     892PRINT*, 'seb ', narea, jpiglo, nbcellsx, nn_hls, nbghostcells_x 
    893893      ! Some checks 
    894       IF( jpiglo /= nbcellsx + 2 + 2*nbghostcells_x )   & 
    895           CALL ctl_stop( 'STOP', 'agrif_nemo_init: Agrif children requires jpiglo == nbcellsx + 2 + 2*nbghostcells_x' ) 
    896       IF( jpjglo /= nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n )   & 
    897           CALL ctl_stop( 'STOP', 'agrif_nemo_init: Agrif children requires jpjglo == nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n' ) 
     894      IF( jpiglo /= nbcellsx + 2 + 2*nn_hls + nbghostcells_x   + nbghostcells_x   )   CALL ctl_stop( 'STOP',    & 
     895         &   'agrif_nemo_init: Agrif children requires jpiglo == nbcellsx + 2 + 2*nn_hls + 2*nbghostcells_x' ) 
     896      IF( jpjglo /= nbcellsy + 2 + 2*nn_hls + nbghostcells_y_s + nbghostcells_y_n )   CALL ctl_stop( 'STOP',    & 
     897         &   'agrif_nemo_init: Agrif children requires jpjglo == nbcellsy + 2 + 2*nn_hls + nbghostcells_y_s + nbghostcells_y_n' ) 
    898898      IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'agrif_nemo_init:Agrif children requires ln_use_jattr = .false. ' ) 
    899899      ! 
  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/LBC/mppini.F90

    r13229 r13236  
    339339      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'mpp_init: unable to allocate standard ocean arrays' ) 
    340340       
    341 #if defined key_agrif 
    342       IF( .NOT. Agrif_Root() ) THEN       ! AGRIF children: specific setting (cf. agrif_user.F90) 
    343          IF( jpiglo /= nbcellsx + 2 * ( nbghostcells + 1 + nn_hls ) )  & 
    344             CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires jpiglo == nbcellsx + 2*( nbghostcells + 1 + nn_hls )' ) 
    345          IF( jpjglo /= nbcellsy + 2 * ( nbghostcells + 1 + nn_hls ) )  & 
    346             CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires jpjglo == nbcellsy + 2*( nbghostcells + 1 + nn_hls )' ) 
    347          IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'mpp_init:Agrif children requires ln_use_jattr = .false. ' ) 
    348          CALL agrif_nemo_init() 
    349       ENDIF 
    350 #endif 
    351341      ! 
    352342      !  2. Index arrays for subdomains 
Note: See TracChangeset for help on using the changeset viewer.