Changeset 15346

Timestamp:

2021-10-07T17:22:40+02:00 (20 months ago)

Author:

emmafiedler

Message:

Tidying up

File:

• NEMO/branches/UKMO/NEMO_4.0.4_ice_strength/src/ICE/icedyn_rdgrft.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_ice_strength/src/ICE/icedyn_rdgrft.F90

@@ -345 +345 @@
       ! This is in general not equal to one because of divergence during transport
      ! zasum(1:npti) = pato_i(1:npti) + SUM( pa_i(1:npti,:), dim=2 )
-     ! EF: to match CICE, this should be the following. What is pa_i(:,0)? Very small.
+     ! EF: to match CICE, this should be the following. What is pa_i(:,0)?? Very small.
       zasum(1:npti) = pato_i(1:npti) + SUM( pa_i(1:npti,1:jpl), dim=2 )   
 
@@ -453 +453 @@
       DO jl = 1, jpl
          DO ji = 1, npti
-            IF ( apartf(ji,jl) > 0._wp ) THEN 
-           ! IF ( pa_i(ji,jl) > epsi10 .and. apartf(ji,jl) > 0._wp ) THEN
+            IF ( apartf(ji,jl) > 0._wp ) THEN
                zhmean         = MAX( SQRT( rn_hstar * zhi(ji,jl) ), zhi(ji,jl) * hrdg_hi_min )
                hrmin  (ji,jl) = MIN( 2._wp * zhi(ji,jl), 0.5_wp * ( zhmean + zhi(ji,jl) ) )
@@ -828 +827 @@
       at_i(:,:) = SUM( a_i(:,:,:), dim=3 )
       vt_i(:,:) = SUM( v_i(:,:,:), dim=3 )
-
-    !  ato_i(:,:) = 1._wp - at_i(:,:)
-
-    !  DO jj = 1, jpj
-    !    ato_i_1d   (ji) = MAX( 0._wp, 1._wp - SUM( at_i(ji,:) ) )
-    !  END DO
       !
       npti = 0   ;   nptidx(:) = 0
@@ -845 +838 @@
       END DO
 
-         CALL tab_3d_2d( npti, nptidx(1:npti), a_i_2d  (1:npti,1:jpl), a_i   )
-         CALL tab_3d_2d( npti, nptidx(1:npti), v_i_2d  (1:npti,1:jpl), v_i   )
-         CALL tab_2d_1d( npti, nptidx(1:npti), ato_i_1d(1:npti)      , ato_i )
+      CALL tab_3d_2d( npti, nptidx(1:npti), a_i_2d  (1:npti,1:jpl), a_i   )
+      CALL tab_3d_2d( npti, nptidx(1:npti), v_i_2d  (1:npti,1:jpl), v_i   )
+      CALL tab_2d_1d( npti, nptidx(1:npti), ato_i_1d(1:npti)      , ato_i )
 
 
@@ -887 +880 @@
            strength_pe(ji,jl) = apartf(ji,jl) * dh2rdg          
 
-         !  strength_pe(ji,jl) = strength_pe(ji,jl) + apartf(ji,jl) * dh2rdg  !CICE format
-
           ELSE
 
            strength_pe(ji,jl) = 0._wp
-          ! strength_pe(ji,jl) = strength_pe(ji,jl) + 0._wp  !CICE format
 
           END IF
@@ -901 +891 @@
 
       strength_pe_sum(:) = SUM(strength_pe(:,:), dim=2)  ! Sum over all categories
-     ! strength_pe_1d(:) = ???  ! CICE format, already summed so how to convert to 1D??
+
 
       DO ji = 1, npti