Changeset 8565 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90

Timestamp:

2017-09-27T12:09:10+02:00 (7 years ago)

Author:

clem

Message:

trying to respect naming convention

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90 (modified) (4 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_ent.F90

@@ -78 +78 @@
       !  1) Cumulative integral of old enthalpy * thickness and layers interfaces
       !--------------------------------------------------------------------------
-      zeh_cum0(1:nidx,0) = 0._wp 
-      zh_cum0 (1:nidx,0) = 0._wp
+      zeh_cum0(1:npti,0) = 0._wp 
+      zh_cum0 (1:npti,0) = 0._wp
       DO jk0 = 1, nlay_i+2
-         DO ji = 1, nidx
+         DO ji = 1, npti
             zeh_cum0(ji,jk0) = zeh_cum0(ji,jk0-1) + eh_i_old(ji,jk0-1)
             zh_cum0 (ji,jk0) = zh_cum0 (ji,jk0-1) + h_i_old (ji,jk0-1)
@@ -91 +91 @@
       !------------------------------------
       ! new layer thickesses
-      DO ji = 1, nidx
+      DO ji = 1, npti
          zhnew(ji) = SUM( h_i_old(ji,0:nlay_i+1) ) * r1_nlay_i  
       END DO
 
       ! new layers interfaces
-      zh_cum1(1:nidx,0) = 0._wp
+      zh_cum1(1:npti,0) = 0._wp
       DO jk1 = 1, nlay_i
-         DO ji = 1, nidx
+         DO ji = 1, npti
             zh_cum1(ji,jk1) = zh_cum1(ji,jk1-1) + zhnew(ji)
          END DO
       END DO
 
-      zeh_cum1(1:nidx,0) = 0._wp 
+      zeh_cum1(1:npti,0) = 0._wp 
       ! new cumulative q*h => linear interpolation
       DO jk0 = 1, nlay_i+1
          DO jk1 = 1, nlay_i-1
-            DO ji = 1, nidx
+            DO ji = 1, npti
                IF( zh_cum1(ji,jk1) <= zh_cum0(ji,jk0) .AND. zh_cum1(ji,jk1) > zh_cum0(ji,jk0-1) ) THEN
                   zeh_cum1(ji,jk1) = ( zeh_cum0(ji,jk0-1) * ( zh_cum0(ji,jk0) - zh_cum1(ji,jk1  ) ) +  &
@@ -117 +117 @@
       END DO
       ! to ensure that total heat content is strictly conserved, set:
-      zeh_cum1(1:nidx,nlay_i) = zeh_cum0(1:nidx,nlay_i+2) 
+      zeh_cum1(1:npti,nlay_i) = zeh_cum0(1:npti,nlay_i+2) 
 
       ! new enthalpies
       DO jk1 = 1, nlay_i
-         DO ji = 1, nidx
+         DO ji = 1, npti
             rswitch      = MAX( 0._wp , SIGN( 1._wp , zhnew(ji) - epsi20 ) ) 
             qnew(ji,jk1) = rswitch * ( zeh_cum1(ji,jk1) - zeh_cum1(ji,jk1-1) ) / MAX( zhnew(ji), epsi20 )
@@ -130 +130 @@
       ! comment: if input h_i_old and eh_i_old are already multiplied by a_i (as in icethd_do), 
       ! then we should not (* a_i) again but not important since this is just to check that remap error is ~0
-      DO ji = 1, nidx
+      DO ji = 1, npti
          hfx_err_rem_1d(ji) = hfx_err_rem_1d(ji) + a_i_1d(ji) * r1_rdtice *  &
             &               ( SUM( qnew(ji,1:nlay_i) ) * zhnew(ji) - SUM( eh_i_old(ji,0:nlay_i+1) ) )