Changeset 11514

Timestamp:

2019-09-09T15:38:47+02:00 (5 years ago)

Author:

clem

Message:

debug ponds with bdy (fraction instead of concentration)

File:

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

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

@@ -222 +222 @@
                sz_i(ji,jj,:,jl) = sz_i(ib,jb,:,jl)
                !
-               SELECT CASE( jpbound )
-                  !
-               CASE( 0 )   ! velocity is inward
-                  oa_i(ji,jj,jl) = rice_age(jbdy) * a_i(ji,jj,jl)     ! age
+               ! ice age and ponds
+               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(ji,jj,jl) = rice_apnd(jbdy)                 ! pond concentration
-                     v_ip(ji,jj,jl) = rice_apnd(jbdy)*rice_hpnd(jbdy) ! pond volume
+                     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
-               CASE( 1 )   ! velocity is outward
-                  oa_i(ji,jj,jl) = oa_i(ib,jb,jl)                     ! age
+               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(ji,jj,jl) = a_ip(ib,jb,jl)                  ! pond concentration
-                     v_ip(ji,jj,jl) = v_ip(ib,jb,jl)                  ! pond volume
+                     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
-               END SELECT
+               ENDIF
                !
                IF( nn_icesal == 1 ) THEN     ! if constant salinity
@@ -272 +273 @@
                t_s (ji,jj,:,jl) = rt0
                t_i (ji,jj,:,jl) = rt0 
+
+               a_ip_frac(ji,jj,jl) = 0._wp
+               h_ip     (ji,jj,jl) = 0._wp
+               a_ip     (ji,jj,jl) = 0._wp
+               v_ip     (ji,jj,jl) = 0._wp
                
                IF( nn_icesal == 1 ) THEN     ! if constant salinity