Changeset 7507

Timestamp:

2016-12-19T12:06:58+01:00 (7 years ago)

Author:

clem

Message:

correct bugs introduced during merge in sea-ice

Location:

branches/2016/dev_merge_2016/NEMOGCM/NEMO

Files:

• LIM_SRC_3/dom_ice.F90 (deleted)
• LIM_SRC_3/limistate.F90 (modified) (3 diffs)
• LIM_SRC_3/limmsh.F90 (deleted)
• LIM_SRC_3/limsbc.F90 (modified) (1 diff)
• OPA_SRC/SBC/sbcblk.F90 (modified) (5 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -218 +218 @@
                            zh_i_ini(ji,jj,jl) = hi_mean(jl)
                         END DO
-                           !
+                        !
                         !--- Concentrations
                         za_i_ini(ji,jj,jl0) = zat_i_ini(ji,jj) / SQRT(REAL(jpl))
@@ -227 +227 @@
                            ENDIF
                         END DO
-                           !
+                        !
                         ! Concentration in the last (i_fill) category
                         za_i_ini(ji,jj,i_fill) = zat_i_ini(ji,jj) - SUM( za_i_ini(ji,jj,1:i_fill-1) )
@@ -274 +274 @@
                   END DO                                    ! end iteration on categories
                   !                                         !============================
-                        !
+                  !
                   IF( lwp .AND. SUM(itest) /= 4 ) THEN 
                      WRITE(numout,*)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90

@@ -34 +34 @@
    USE traqsr         ! add penetration of solar flux in the calculation of heat budget
    USE domvvl         ! Variable volume
-   USE limctl         ! 
-   USE limcons        ! 
+   USE limctl         !
+   USE limcons        !
    USE bdy_oce  , ONLY: ln_bdy
    !

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

@@ -641 +641 @@
                zwndj_t = sf(jp_wndj)%fnow(ji,jj,1) - rn_vfac * 0.25 * (  v_ice(ji,jj+1) + v_ice(ji+1,jj+1)   &
                   &                                                    + v_ice(ji,jj  ) + v_ice(ji+1,jj  )  )
-               wndm_ice(ji,jj)  = SQRT( zwndi_t * zwndi_t + zwndj_t * zwndj_t ) * tmask(ji,jj,1)
+               wndm_ice(ji,jj) = SQRT( zwndi_t * zwndi_t + zwndj_t * zwndj_t ) * tmask(ji,jj,1)
             END DO
          END DO
@@ -760 +760 @@
                ! Latent heat sensitivity for ice (Dqla/Dt)
                IF( qla_ice(ji,jj,jl) > 0._wp ) THEN
-                  dqla_ice(ji,jj,jl) = rn_efac * zcoef_dqla * wndm_ice(ji,jj) / ( zst2 ) * EXP( -5897.8 / ptsu(ji,jj,jl) )
+                  dqla_ice(ji,jj,jl) = rn_efac * zcoef_dqla * Cd(ji,jj) * wndm_ice(ji,jj) / ( zst2 ) * EXP( -5897.8 / ptsu(ji,jj,jl) )
                ELSE
                   dqla_ice(ji,jj,jl) = 0._wp
@@ -818 +818 @@
 
       ! --- heat content of evap over ice in W/m2 (to be used in 1D-thermo) ---
-      ! !
       DO jl = 1, jpl
-         qevap_ice(:,:,jl) = 0._wp ! should be -evap_ice(:,:,jl)*( ( Tice - rt0) * cpic * tmask(:,:,1) )
-                                   ! But we do not have Tice => consider it at
-                                   ! 0??C => evap=0 
+         qevap_ice(:,:,jl) = 0._wp ! should be -evap_ice(:,:,jl)*( ( Tice - rt0 ) * cpic * tmask(:,:,1) )
+                                   ! But we do not have Tice => consider it at 0degC => evap=0 
       END DO
 
@@ -998 +996 @@
       !!                 and going down to Cdi(say 1.4e-3) for A=1
       !!
-      !!                 It is theoretically applicable to all ice conditions !(not only MIZ)
+      !!                 It is theoretically applicable to all ice conditions (not only MIZ)
       !!                 => see Lupkes et al (2013)
       !!
@@ -1015 +1013 @@
 
       ! generic drag over a cell partly covered by ice
-      !!Cd(:,:) = Cd_oce(:,:) * ( 1._wp - at_i_b(:,:) ) +  & !! pure ocean drag
-      !!   &      Cd_ice      *           at_i_b(:,:)   +  & !! pure ice drag
-      !!   &      zCe         * ( 1._wp - at_i_b(:,:) )**zcoef * !at_i_b(:,:)**zmu   ! change due to sea-ice morphology
+      !!Cd(:,:) = Cd_oce(:,:) * ( 1._wp - at_i_b(:,:) ) +  &                        ! pure ocean drag
+      !!   &      Cd_ice      *           at_i_b(:,:)   +  &                        ! pure ice drag
+      !!   &      zCe         * ( 1._wp - at_i_b(:,:) )**zcoef * at_i_b(:,:)**zmu   ! change due to sea-ice morphology
 
       ! ice-atm drag
-      Cd(:,:) = Cd_ice +  & ! pure ice drag
-         &      zCe    * ( 1._wp - at_i_b(:,:) )**zcoef * at_i_b(:,:)**(zmu-1._wp)   ! change due to sea-ice morphology
+      Cd(:,:) = Cd_ice +  &                                                         ! pure ice drag
+         &      zCe    * ( 1._wp - at_i_b(:,:) )**zcoef * at_i_b(:,:)**(zmu-1._wp)  ! change due to sea-ice morphology
       
    END SUBROUTINE Cdn10_Lupkes2012