New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 9462 for branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 – NEMO

Ignore:
Timestamp:
2018-04-06T17:48:30+02:00 (4 years ago)
Author:
jcastill
Message:

Rearrange some lines so that it merges with operational branches

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

    r7606 r9462  
    467467                &                        + fwfisf(:,:) + fwfisf_b(:,:)                     ) 
    468468      ENDIF 
    469       !  
     469      !                                   !* Fill boundary data arrays for AGRIF 
     470      !                                   ! ------------------------------------ 
     471#if defined key_agrif 
     472         IF( .NOT.Agrif_Root() ) CALL agrif_dta_ts( kt ) 
     473#endif 
     474      ! 
     475      ! ----------------------------------------------------------------------- 
     476      !  Phase 2 : Integration of the barotropic equations  
     477      ! ----------------------------------------------------------------------- 
     478      ! 
     479      ! Moved here to allow merging with other branch  
    470480      IF( ln_sdw ) THEN                         ! Stokes drift divergence added if necessary  
    471481         zssh_frc(:,:) = zssh_frc(:,:) + div_sd(:,:)  
     
    478488      ENDIF 
    479489#endif 
    480       !                                   !* Fill boundary data arrays for AGRIF 
    481       !                                   ! ------------------------------------ 
    482 #if defined key_agrif 
    483          IF( .NOT.Agrif_Root() ) CALL agrif_dta_ts( kt ) 
    484 #endif 
    485       ! 
    486       ! ----------------------------------------------------------------------- 
    487       !  Phase 2 : Integration of the barotropic equations  
    488       ! ----------------------------------------------------------------------- 
    489       ! 
    490490      !                                             ! ==================== ! 
    491491      !                                             !    Initialisations   ! 
Note: See TracChangeset for help on using the changeset viewer.