Changeset 12305


Ignore:
Timestamp:
2020-01-07T18:33:24+01:00 (3 weeks ago)
Author:
kingr
Message:

Revert hdivn change. Test non-removal of sshinc in barotropic ts

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_collate_IAUtest/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

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

    r11277 r12305  
    472472#if defined key_asminc 
    473473      !                                         ! 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 
     474!      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN 
     475!         zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:) 
     476!      ENDIF 
    477477#endif 
    478478      !                                   !* Fill boundary data arrays with AGRIF 
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_IAUtest/NEMOGCM/NEMO/OPA_SRC/step.F90

    r12304 r12305  
    347347                                                             ! Revert now divergence and rotational to previously computed ones  
    348348                                                             !(needed because of the time swap in div_cur, at the beginning of each time step) 
    349                                !hdivn(:,:,:) = hdivb(:,:,:) 
    350                                !rotn(:,:,:)  = rotb(:,:,:)  
     349                               hdivn(:,:,:) = hdivb(:,:,:) 
     350                               rotn(:,:,:)  = rotb(:,:,:)  
    351351 
    352352                               CALL dyn_bfr( kstp )         ! bottom friction 
Note: See TracChangeset for help on using the changeset viewer.