Changeset 12784

Timestamp:

2020-04-20T20:26:12+02:00 (4 years ago)

Author:

rrenshaw

Message:

fix for profiles

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis4/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/dynspg_ts.F90 (modified) (3 diffs)
• nemogcm.F90 (modified) (1 diff)

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis4/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -12 +12 @@
    !!             3.6  ! 2013-11  (A. Coward) Update for z-tilde compatibility
    !!              -   ! 2016-12  (G. Madec, E. Clementi) update for Stoke-Drift divergence
+   !!              -   ! 2020-04  (R. King) RJR: included Rob's SLA fix
+   !!                              https://code.metoffice.gov.uk/trac/utils/ticket/261
    !!---------------------------------------------------------------------
 #if defined key_dynspg_ts   ||   defined key_esopa
@@ -49 +51 @@
    USE agrif_opa_interp ! agrif
 #endif
-#if defined key_asminc   
-   USE asminc          ! Assimilation increment
-#endif
 
    IMPLICIT NONE
@@ -470 +469 @@
                 &                        + fwfisf(:,:) + fwfisf_b(:,:)                     )
       ENDIF
-#if defined key_asminc
-      !                                         ! Include the IAU weighted SSH increment
-      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN
-         zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:)
-      ENDIF
-#endif
       !                                   !* Fill boundary data arrays with AGRIF
       !                                   ! -------------------------------------

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis4/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -648 +648 @@
       IF( numdct_salt     /= -1 )   CLOSE( numdct_salt     )   ! salt transports
       IF( numdct_NOOS     /= -1 )   CLOSE( numdct_NOOS     )   ! NOOS transports
+      IF( numdct_NOOS_h /= -1 )   CLOSE( numdct_NOOS_h )   ! NOOS transports
+      IF( numdct_in /= -1 )   CLOSE( numdct_in )   ! NOOS transports
 
       !