Changeset 8841 for branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

Timestamp:

2017-11-29T05:08:05+01:00 (6 years ago)

Author:

deazer

Message:

Bring in Trunk Changes at version 8814
This revision wont run as is, requires next revision with merged changes
This revision serves as a reference point to what changes from the trunk at brought in by the merge
in the next revision

File:

• branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (4 diffs)

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -86 +86 @@
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ssh_bkg, ssh_bkginc   ! Background sea surface height and its increment
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   seaice_bkginc         ! Increment to the background sea ice conc
+#if defined key_cice && defined key_asminc
+   REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ndaice_da             ! ice increment tendency into CICE
+#endif
 
    !! * Substitutions
@@ -339 +342 @@
       ALLOCATE( ssh_iau(jpi,jpj)      )
 #endif
+#if defined key_cice && defined key_asminc
+      ALLOCATE( ndaice_da(jpi,jpj)      )
+#endif
       t_bkginc(:,:,:) = 0.0
       s_bkginc(:,:,:) = 0.0
@@ -347 +353 @@
 #if defined key_asminc
       ssh_iau(:,:)    = 0.0
+#endif
+#if defined key_cice && defined key_asminc
+      ndaice_da(:,:) = 0.0
 #endif
       IF ( ( ln_trainc ).OR.( ln_dyninc ).OR.( ln_sshinc ).OR.( ln_seaiceinc ) ) THEN
@@ -759 +768 @@
             ENDIF
             !
+#if defined key_asminc
+         ELSE IF( kt == nitiaufin_r+1 ) THEN
+            !
+            ssh_iau(:,:) = 0._wp
+            !
+#endif
          ENDIF
          !                          !-----------------------------------------