Changeset 3374 for branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

Timestamp:

2012-04-30T13:24:25+02:00 (12 years ago)

Author:

sga

Message:

NEMO branch dev_r3337_NOCS10_ICB: adopt mig, mjg, mi1 and mj1 for improved obscurity

File:

• branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) (4 diffs)

branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

@@ -106 +106 @@
          DO ji = 1, jpi
             src_calving_hflx(ji,jj) = narea
-            src_calving     (ji,jj) = nicbpack * (njmpp+jj-1) + nimpp+ji-1   !!gm use here mjg(jj) and mig(ji)...
-!!gm        src_calving     (ji,jj) = nicbpack * mjg(jj) + mig(ji)
+            src_calving     (ji,jj) = nicbpack * mjg(jj) + mig(ji)
          END DO
       END DO
@@ -124 +123 @@
          i1 = i3 - i2*nicbpack
          i3 = INT( src_calving_hflx(ji,jj) )
-         IF( i1 == nimpp+ji-1 .AND. i3 == narea ) THEN
+         IF( i1 == mig(ji) .AND. i3 == narea ) THEN
             IF( nicbdi < 0 ) THEN   ;   nicbdi = ji
             ELSE                    ;   nicbei = ji
@@ -140 +139 @@
          i1 = i3 - i2*nicbpack
          i3 = INT( src_calving_hflx(ji,jj) )
-         IF( i2 == njmpp+jj-1 .AND. i3 == narea ) THEN
+         IF( i2 == mjg(jj) .AND. i3 == narea ) THEN
             IF( nicbdj < 0 ) THEN   ;   nicbdj = jj
             ELSE                    ;   nicbej = jj
@@ -300 +299 @@
                 rn_test_box(3) < gphit(ji,jj) .AND. gphit(ji,jj) < rn_test_box(4) ) THEN
                localberg%mass_scaling = rn_mass_scaling(iberg)
-               localpt%xi = REAL( nimpp+ji-1, wp )
-               localpt%yj = REAL( njmpp+jj-1, wp )
+               localpt%xi = REAL( mig(ji), wp )
+               localpt%yj = REAL( mjg(jj), wp )
                localpt%lon = icb_utl_bilin(glamt, localpt%xi, localpt%yj, 'T', 0, 0 )
                localpt%lat = icb_utl_bilin(gphit, localpt%xi, localpt%yj, 'T', 0, 0 )