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 12354 – NEMO

Changeset 12354


Ignore:
Timestamp:
2020-02-06T14:58:43+01:00 (4 years ago)
Author:
kingr
Message:

Reverted change made when merging branches at r10268. Removing this line avoids introducing spurious near surface freshening when assimilating SSH obs.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

    r11277 r12354  
    4949   USE agrif_opa_interp ! agrif 
    5050#endif 
    51 #if defined key_asminc    
    52    USE asminc          ! Assimilation increment 
    53 #endif 
    5451 
    5552   IMPLICIT NONE 
     
    470467                &                        + fwfisf(:,:) + fwfisf_b(:,:)                     ) 
    471468      ENDIF 
    472 #if defined key_asminc 
    473       !                                         ! Include the IAU weighted SSH increment 
    474       IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN 
    475          zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:) 
    476       ENDIF 
    477 #endif 
    478469      !                                   !* Fill boundary data arrays with AGRIF 
    479470      !                                   ! ------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.