Changeset 11518 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdyice.F90

Timestamp:

2019-09-09T19:57:45+02:00 (5 years ago)

Author:

clem

Message:

add the final touch to the famous gaston's branch. More precisely, add the possibility to have melt ponds as input file when using bdy

File:

• NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdyice.F90 (modified) (4 diffs)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdyice.F90

@@ -161 +161 @@
             t_su(ji,jj,  jl) = ( t_su(ji,jj,  jl) * zwgt1 + dta%tsu(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Surf temperature
             s_i (ji,jj,  jl) = ( s_i (ji,jj,  jl) * zwgt1 + dta%s_i(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Ice  salinity
-            sz_i(ji,jj,:,jl) =   s_i (ji,jj,  jl)
+            a_ip(ji,jj,  jl) = ( a_ip(ji,jj,  jl) * zwgt1 + dta%aip(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Ice  pond concentration
+            h_ip(ji,jj,  jl) = ( h_ip(ji,jj,  jl) * zwgt1 + dta%hip(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Ice  pond depth
+            !
+            sz_i(ji,jj,:,jl) = s_i(ji,jj,jl)
+            !
+            ! make sure ponds = 0 if no ponds scheme
+            IF( .NOT.ln_pnd ) THEN
+               a_ip(ji,jj,jl) = 0._wp
+               h_ip(ji,jj,jl) = 0._wp
+            ENDIF
             !
             ! -----------------
@@ -177 +186 @@
             h_i(ji,jj,jl) = MIN( hi_max(jl), h_i(ji,jj,jl) + zdh )
             h_s(ji,jj,jl) = MAX( 0._wp, h_s(ji,jj,jl) - zdh * rhoi / rhos ) 
-
+            !
          ENDDO
       ENDDO
@@ -220 +229 @@
                t_su(ji,jj,  jl) = t_su(ib,jb,  jl)
                s_i (ji,jj,  jl) = s_i (ib,jb,  jl)
+               a_ip(ji,jj,  jl) = a_ip(ib,jb,  jl)
+               h_ip(ji,jj,  jl) = h_ip(ib,jb,  jl)
+               !
                sz_i(ji,jj,:,jl) = sz_i(ib,jb,:,jl)
                !
-               ! ice age and ponds
-               IF( jpbound == 0 ) THEN  ! velocity is inward
+               ! ice age
+               IF    ( jpbound == 0 ) THEN  ! velocity is inward
                   oa_i(ji,jj,jl) = rice_age(jbdy) * a_i(ji,jj,jl)
-                  IF( ln_pnd_CST .OR. ln_pnd_H12 ) THEN
-                     a_ip_frac(ji,jj,jl) = rice_apnd(jbdy)
-                     a_ip     (ji,jj,jl) = rice_apnd(jbdy) * a_i (ji,jj,jl)
-                     v_ip     (ji,jj,jl) = rice_hpnd(jbdy) * a_ip(ji,jj,jl)
-                  ENDIF
                ELSEIF( jpbound == 1 ) THEN  ! velocity is outward
                   oa_i(ji,jj,jl) = oa_i(ib,jb,jl)
-                  IF( ln_pnd_CST .OR. ln_pnd_H12 ) THEN
-                     a_ip_frac(ji,jj,jl) = a_ip_frac(ib,jb,jl)
-                     a_ip     (ji,jj,jl) = a_ip     (ib,jb,jl)
-                     v_ip     (ji,jj,jl) = v_ip     (ib,jb,jl)
-                  ENDIF
                ENDIF
                !
@@ -261 +263 @@
                   e_i(ji,jj,jk,jl) = e_i(ji,jj,jk,jl) * v_i(ji,jj,jl) * r1_nlay_i                            ! enthalpy in J/m2
                END DO
+               !
+               ! melt ponds
+               IF( a_i(ji,jj,jl) > epsi10 ) THEN
+                  a_ip_frac(ji,jj,jl) = a_ip(ji,jj,jl) / a_i (ji,jj,jl)
+               ELSE
+                  a_ip_frac(ji,jj,jl) = 0._wp
+               ENDIF
+               v_ip(ji,jj,jl) = h_ip(ji,jj,jl) * a_ip(ji,jj,jl)
                !
             ELSE   ! no ice at the boundary