Changeset 8868 for branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/DYN

Timestamp:

2017-12-01T09:43:23+01:00 (7 years ago)

Author:

timgraham

Message:

Merged dev_r8789_sbc into branch

Location:

branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/DYN

Files:

• divhor.F90 (modified) (2 diffs)
• sshwzv.F90 (modified) (2 diffs)

branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/DYN/divhor.F90

@@ -25 +25 @@
    USE iscplhsb        ! ice sheet / ocean coupling
    USE iscplini        ! ice sheet / ocean coupling
+#if defined key_asminc   
+   USE asminc          ! Assimilation increment
+#endif
    !
    USE in_out_manager  ! I/O manager
@@ -92 +95 @@
       IF( ln_rnf )   CALL sbc_rnf_div( hdivn )      !==  runoffs    ==!   (update hdivn field)
       !
+#if defined key_asminc 
+      IF( ln_sshinc .AND. ln_asmiau )   CALL ssh_asm_div( kt, hdivn )   !==  SSH assimilation  ==!   (update hdivn field)
+      ! 
+#endif
       IF( ln_isf )   CALL sbc_isf_div( hdivn )      !==  ice shelf  ==!   (update hdivn field)
       !

branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -27 +27 @@
    USE agrif_opa_interp
 #endif
-#if defined key_asminc   
-   USE   asminc       ! Assimilation increment
-#endif
    !
    USE in_out_manager ! I/O manager
@@ -121 +118 @@
          ENDIF
       ENDIF
-
-#if defined key_asminc
-      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN     ! Include the IAU weighted SSH increment
-         CALL ssh_asm_inc( kt )
-         ssha(:,:) = ssha(:,:) + z2dt * ssh_iau(:,:)
-      ENDIF
-#endif
       !                                           !------------------------------!
       !                                           !           outputs            !