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 9466 for branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 – NEMO

Ignore:
Timestamp:
2018-04-09T15:45:36+02:00 (6 years ago)
Author:
jcastill
Message:

Move again some lines to allow merging with operational branches

File:
1 edited

Legend:

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

    r9462 r9466  
    467467                &                        + fwfisf(:,:) + fwfisf_b(:,:)                     ) 
    468468      ENDIF 
     469#if defined key_asminc 
     470      !                                         ! Include the IAU weighted SSH increment 
     471      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN 
     472         zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:) 
     473      ENDIF 
     474#endif 
    469475      !                                   !* Fill boundary data arrays for AGRIF 
    470476      !                                   ! ------------------------------------ 
     
    474480      ! 
    475481      ! ----------------------------------------------------------------------- 
    476       !  Phase 2 : Integration of the barotropic equations  
     482      !  Phase 2 : Integration of the barotropic equations 
    477483      ! ----------------------------------------------------------------------- 
    478484      ! 
    479       ! Moved here to allow merging with other branch  
    480       IF( ln_sdw ) THEN                         ! Stokes drift divergence added if necessary  
    481          zssh_frc(:,:) = zssh_frc(:,:) + div_sd(:,:)  
    482       ENDIF  
    483       !  
    484 #if defined key_asminc 
    485       !                                         ! Include the IAU weighted SSH increment 
    486       IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN 
    487          zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:) 
    488       ENDIF 
    489 #endif 
    490485      !                                             ! ==================== ! 
    491486      !                                             !    Initialisations   ! 
    492       !                                             ! ==================== !   
     487      !                                             ! ==================== !  
    493488      ! Initialize barotropic variables:       
    494489      IF( ll_init )THEN 
     
    500495         vb_e   (:,:) = 0._wp 
    501496      ENDIF 
     497      ! 
     498      ! Moved here to allow merging with other branch  
     499      IF( ln_sdw ) THEN                         ! Stokes drift divergence added if necessary  
     500         zssh_frc(:,:) = zssh_frc(:,:) + div_sd(:,:)  
     501      ENDIF  
    502502      ! 
    503503      IF (ln_bt_fw) THEN                  ! FORWARD integration: start from NOW fields                     
Note: See TracChangeset for help on using the changeset viewer.