Changeset 8313 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90

Timestamp:

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

Author:

clem

Message:

STEP2 (2): remove obsolete features

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 (modified) (4 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90

@@ -112 +112 @@
       ! --- case we bypass ice thermodynamics --- !
       IF( .NOT. ln_limthd ) THEN   ! we suppose ice is impermeable => ocean is isolated from atmosphere
-         hfx_in   (:,:)   = pfrld(:,:) * ( qns_oce(:,:) + qsr_oce(:,:) ) + qemp_oce(:,:)
-         hfx_out  (:,:)   = pfrld(:,:) *   qns_oce(:,:)                  + qemp_oce(:,:)
+         hfx_in   (:,:)   = ( 1._wp - at_i_b(:,:) ) * ( qns_oce(:,:) + qsr_oce(:,:) ) + qemp_oce(:,:)
+         hfx_out  (:,:)   = ( 1._wp - at_i_b(:,:) ) *   qns_oce(:,:)                  + qemp_oce(:,:)
          ftr_ice  (:,:,:) = 0._wp
          emp_ice  (:,:)   = 0._wp
@@ -195 +195 @@
          &     + sfx_res(:,:) + sfx_dyn(:,:) + sfx_bri(:,:) + sfx_sub(:,:) + sfx_lam(:,:)
 
-      !-------------------------------------------------------------!
-      !   mass of snow and ice per unit area for embedded sea-ice   !
-      !-------------------------------------------------------------!
-      IF( nn_ice_embd /= 0 ) THEN
-         ! save mass from the previous ice time step
-         snwice_mass_b(:,:) = snwice_mass(:,:)                  
-         ! new mass per unit area
-         snwice_mass  (:,:) = tmask(:,:,1) * ( rhosn * vt_s(:,:) + rhoic * vt_i(:,:)  ) 
-         ! time evolution of snow+ice mass
-         snwice_fmass (:,:) = ( snwice_mass(:,:) - snwice_mass_b(:,:) ) * r1_rdtice
-      ENDIF
+      !----------------------------------------!
+      !   mass of snow and ice per unit area   !
+      !----------------------------------------!
+      ! save mass from the previous ice time step
+      snwice_mass_b(:,:) = snwice_mass(:,:)                  
+      ! new mass per unit area
+      snwice_mass  (:,:) = tmask(:,:,1) * ( rhosn * vt_s(:,:) + rhoic * vt_i(:,:)  ) 
+      ! time evolution of snow+ice mass
+      snwice_fmass (:,:) = ( snwice_mass(:,:) - snwice_mass_b(:,:) ) * r1_rdtice
 
       !-----------------------------------------------!
@@ -243 +241 @@
       !!                      tmod_io = rhoco * | U_ice-U_oce |
       !!                - update the modulus of stress at ocean surface
-      !!                      taum = frld * taum + (1-frld) * tmod_io * | U_ice-U_oce |
+      !!                      taum = (1-a) * taum + a * tmod_io * | U_ice-U_oce |
       !!              * at each ocean time step (every kt): 
       !!                  compute linearized ice-ocean stresses as
@@ -336 +334 @@
       !
       IF( .NOT. ln_rstart ) THEN
-         !                                      ! embedded sea ice
-         IF( nn_ice_embd /= 0 ) THEN            ! mass exchanges between ice and ocean (case 1 or 2) set the snow+ice mass
-            snwice_mass  (:,:) = tmask(:,:,1) * ( rhosn * vt_s(:,:) + rhoic * vt_i(:,:)  )
-            snwice_mass_b(:,:) = snwice_mass(:,:)
-         ELSE
-            snwice_mass  (:,:) = 0._wp          ! no mass exchanges
-            snwice_mass_b(:,:) = 0._wp          ! no mass exchanges
-         ENDIF
-         IF( nn_ice_embd == 2 ) THEN            ! full embedment (case 2) deplete the initial ssh below sea-ice area
+         !
+         snwice_mass  (:,:) = tmask(:,:,1) * ( rhosn * vt_s(:,:) + rhoic * vt_i(:,:)  )   ! snow+ice mass
+         snwice_mass_b(:,:) = snwice_mass(:,:)
+         !
+         IF( ln_ice_embd ) THEN            ! embedded sea-ice: deplete the initial ssh below sea-ice area
             sshn(:,:) = sshn(:,:) - snwice_mass(:,:) * r1_rau0
             sshb(:,:) = sshb(:,:) - snwice_mass(:,:) * r1_rau0