Changeset 8313 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/ASM

Timestamp:

2017-07-10T20:24:21+02:00 (7 years ago)

Author:

clem

Message:

STEP2 (2): remove obsolete features

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/ASM

Files:

• asmbkg.F90 (modified) (1 diff)
• asminc.F90 (modified) (5 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90

@@ -146 +146 @@
             CALL iom_rstput( kt, nitdin_r, inum, 'sshn'   , sshn              )
 #if defined key_lim3
-            IF( nn_ice == 2  .OR.  nn_ice == 3 ) THEN
-               IF( ALLOCATED(frld) ) THEN
-                  CALL iom_rstput( kt, nitdin_r, inum, 'iceconc', 1._wp - frld(:,:)   )
+            IF( nn_ice == 3 ) THEN
+               IF( ALLOCATED(at_i) ) THEN
+                  CALL iom_rstput( kt, nitdin_r, inum, 'iceconc', at_i(:,:)   )
                ELSE
-                  CALL ctl_warn('Ice concentration not written to background as ice variable frld not allocated on this timestep')
+                  CALL ctl_warn('Ice concentration not written to background as ice variable at_i not allocated on this timestep')
                ENDIF
             ENDIF

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -36 +36 @@
    USE lib_mpp          ! MPP library
 #if defined key_lim3
-   USE ice,   ONLY: htm_i, at_i, pfrld, phicif
+   USE ice,   ONLY: htm_i, at_i, at_i_b
 #endif
    USE sbc_oce          ! Surface boundary condition variables.
@@ -837 +837 @@
             zohicif(:,:) = htm_i(:,:)
             !
-            at_i(:,:) = 1. - MIN( MAX( 1.-at_i(:,:) - seaice_bkginc(:,:) * zincwgt, 0.0_wp), 1.0_wp)
-            pfrld     =      MIN( MAX( pfrld(:,:)   - seaice_bkginc(:,:) * zincwgt, 0.0_wp), 1.0_wp)
+            at_i  (:,:) = 1. - MIN( MAX( 1.-at_i  (:,:) - seaice_bkginc(:,:) * zincwgt, 0.0_wp), 1.0_wp)
+            at_i_b(:,:) = 1. - MIN( MAX( 1.-at_i_b(:,:) - seaice_bkginc(:,:) * zincwgt, 0.0_wp), 1.0_wp)
             fr_i(:,:) = at_i(:,:)        ! adjust ice fraction
             !
@@ -852 +852 @@
             ! nudge ice depth
             htm_i (:,:) = htm_i (:,:) + zhicifinc(:,:)
-            phicif(:,:) = phicif(:,:) + zhicifinc(:,:)       
             !
             ! seaice salinity balancing (to add)
@@ -889 +888 @@
             ! Initialize the now fields the background + increment
             at_i(:,:) = 1. - MIN( MAX( 1.-at_i(:,:) - seaice_bkginc(:,:), 0.0_wp), 1.0_wp)
-            pfrld(:,:) = 1.-at_i(:,:) 
+            at_i_b(:,:) = at_i(:,:) 
             fr_i(:,:) = at_i(:,:)        ! adjust ice fraction
             !
@@ -903 +902 @@
             ! nudge ice depth
             htm_i (:,:) = htm_i (:,:) + zhicifinc(:,:)
-            phicif(:,:) = phicif(:,:)       
             !
             ! seaice salinity balancing (to add)