Changeset 8879 for branches/UKMO/dev_r8126_LIM3_couple/NEMOGCM/NEMO/OPA_SRC/OBS

Timestamp:

2017-12-01T14:53:57+01:00 (6 years ago)

Author:

frrh

Message:

Merge in ​http://fcm3/projects/NEMO.xm/log/branches/UKMO/dev_r8183_ICEMODEL_svn_removed
revisions 8738:8847 inclusive.

File:

• branches/UKMO/dev_r8126_LIM3_couple/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (8 diffs)

branches/UKMO/dev_r8126_LIM3_couple/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -291 +291 @@
             END DO
          ENDIF
-#if defined key_lim2 || defined key_lim3
+#if defined key_lim3
          IF (ln_sic) THEN
             jtype = jtype + 1
@@ -539 +539 @@
 #if defined  key_lim3
       USE ice, ONLY : &            ! LIM3 Ice model variables
-         & frld
-#endif
-#if defined key_lim2
-      USE ice_2, ONLY : &          ! LIM2 Ice model variables
-         & frld
+         & at_i
 #endif
       IMPLICIT NONE
@@ -567 +563 @@
          & zgphi1,    &            ! Model latitudes for prof variable 1
          & zgphi2                  ! Model latitudes for prof variable 2
-#if ! defined key_lim2 && ! defined key_lim3
-      REAL(wp), POINTER, DIMENSION(:,:) :: frld
+#if ! defined key_lim3
+      REAL(wp), POINTER, DIMENSION(:,:) :: at_i
 #endif
       LOGICAL :: llnightav        ! Logical for calculating night-time average
@@ -582 +578 @@
       CALL wrk_alloc( jpi, jpj, zgphi1 )
       CALL wrk_alloc( jpi, jpj, zgphi2 )
-#if ! defined key_lim2 && ! defined key_lim3
-      CALL wrk_alloc(jpi,jpj,frld) 
+#if ! defined key_lim3
+      CALL wrk_alloc(jpi,jpj,at_i) 
 #endif
 
@@ -595 +591 @@
 
       !-----------------------------------------------------------------------
-      ! No LIM => frld == 0.0_wp
-      !-----------------------------------------------------------------------
-#if ! defined key_lim2 && ! defined key_lim3
-      frld(:,:) = 0.0_wp
+      ! No LIM => at_i == 0.0_wp
+      !-----------------------------------------------------------------------
+#if ! defined key_lim3
+      at_i(:,:) = 0.0_wp
 #endif
       !-----------------------------------------------------------------------
@@ -665 +661 @@
                zsurfvar(:,:) = sshn(:,:)
                llnightav = .FALSE.
-#if defined key_lim2 || defined key_lim3
+#if defined key_lim3
             CASE('sic')
                IF ( kstp == 0 ) THEN
@@ -678 +674 @@
                   CYCLE
                ELSE
-                  zsurfvar(:,:) = 1._wp - frld(:,:)
+                  zsurfvar(:,:) = at_i(:,:)
                ENDIF
 
@@ -702 +698 @@
       CALL wrk_dealloc( jpi, jpj, zgphi1 )
       CALL wrk_dealloc( jpi, jpj, zgphi2 )
-#if ! defined key_lim2 && ! defined key_lim3
-      CALL wrk_dealloc(jpi,jpj,frld)
+#if ! defined key_lim3
+      CALL wrk_dealloc(jpi,jpj,at_i)
 #endif