Changeset 12784
- Timestamp:
- 2020-04-20T20:26:12+02:00 (5 years ago)
- Location:
- branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis4/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis4/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r11277 r12784 12 12 !! 3.6 ! 2013-11 (A. Coward) Update for z-tilde compatibility 13 13 !! - ! 2016-12 (G. Madec, E. Clementi) update for Stoke-Drift divergence 14 !! - ! 2020-04 (R. King) RJR: included Rob's SLA fix 15 !! https://code.metoffice.gov.uk/trac/utils/ticket/261 14 16 !!--------------------------------------------------------------------- 15 17 #if defined key_dynspg_ts || defined key_esopa … … 49 51 USE agrif_opa_interp ! agrif 50 52 #endif 51 #if defined key_asminc52 USE asminc ! Assimilation increment53 #endif54 53 55 54 IMPLICIT NONE … … 470 469 & + fwfisf(:,:) + fwfisf_b(:,:) ) 471 470 ENDIF 472 #if defined key_asminc473 ! ! Include the IAU weighted SSH increment474 IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN475 zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:)476 ENDIF477 #endif478 471 ! !* Fill boundary data arrays with AGRIF 479 472 ! ! ------------------------------------- -
branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis4/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
r11639 r12784 648 648 IF( numdct_salt /= -1 ) CLOSE( numdct_salt ) ! salt transports 649 649 IF( numdct_NOOS /= -1 ) CLOSE( numdct_NOOS ) ! NOOS transports 650 IF( numdct_NOOS_h /= -1 ) CLOSE( numdct_NOOS_h ) ! NOOS transports 651 IF( numdct_in /= -1 ) CLOSE( numdct_in ) ! NOOS transports 650 652 651 653 !
Note: See TracChangeset
for help on using the changeset viewer.