Changeset 9448

Timestamp:

2018-03-28T18:42:49+02:00 (7 years ago)

Author:

clem

Message:

correct minor bugs mostly for outputs

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3

Files:

• iceistate.F90 (modified) (1 diff)
• icestp.F90 (modified) (1 diff)
• icevar.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90

@@ -114 +114 @@
       DO jl = 1, jpl
          t_su   (:,:,jl) = rt0 * tmask(:,:,1)  ! temp at the surface
-         t_si   (:,:,jl) = rt0 * tmask(:,:,1)  ! temp at the ice-snow interface
          cnd_ice(:,:,jl) = 0._wp               ! initialisation of the effective conductivity at the top of ice/snow (Jules coupling)
       END DO

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

@@ -409 +409 @@
       ! SIMIP diagnostics
       diag_fc_bo(:,:) = 0._wp ; diag_fc_su(:,:) = 0._wp
+      t_si(:,:,:) = rt0       ! temp at the ice-snow interface
 
       tau_icebfr(:,:)   = 0._wp   ! landfast ice param only (clem: important to keep the init here)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90

@@ -464 +464 @@
          ! Zap ice energy and use ocean heat to melt ice
          !-----------------------------------------------------------------
-         WHERE( a_i(:,:,jl) > epsi20 )   ;   h_i(:,:,jl) = v_i(:,:,jl) / a_i(:,:,jl)
+         WHERE( a_i(:,:,jl) > epsi10 )   ;   h_i(:,:,jl) = v_i(:,:,jl) / a_i(:,:,jl)
          ELSEWHERE                       ;   h_i(:,:,jl) = 0._wp
          END WHERE
@@ -504 +504 @@
                ! zap ice and snow volume, add water and salt to ocean
                !-----------------------------------------------------------------
-               ato_i(ji,jj)    = a_i (ji,jj,jl) * ( 1._wp - zswitch(ji,jj) ) + ato_i(ji,jj)
                a_i  (ji,jj,jl) = a_i (ji,jj,jl) * zswitch(ji,jj)
                v_i  (ji,jj,jl) = v_i (ji,jj,jl) * zswitch(ji,jj)