Changeset 10115 for NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

Timestamp:

2018-09-12T15:59:13+02:00 (6 years ago)

Author:

cbricaud

Message:

phase 3.6 coarsening branch with nemo_3.6_rev9192

File:

• NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (4 diffs)

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -87 +87 @@
    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
@@ -336 +339 @@
       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
@@ -344 +350 @@
 #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
@@ -891 +900 @@
                DEALLOCATE( ssh_bkginc )
             ENDIF
-
+#if defined key_asminc
+         ELSE IF( kt == nitiaufin_r+1 ) THEN
+            !  
+            ssh_iau(:,:) = 0._wp
+            ! 
+#endif
          ENDIF