Changeset 1255 for trunk/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90

Timestamp:

2009-01-13T11:20:17+01:00 (16 years ago)

Author:

cetlod

Message:

minor modifications in all top models, see ticket:299

File:

• trunk/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90 (modified) (6 diffs)

trunk/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90

@@ -46 +46 @@
       !!----------------------------------------------------------------------
       CHARACTER (len=32) ::  clname
-      INTEGER            ::  jn
       !!
 #if defined key_trc_diaadd
+      INTEGER ::  jl, jn
       ! definition of additional diagnostic as a structure
       TYPE DIAG
@@ -127 +127 @@
       nwritedia = 10                   ! default values
 
-      DO jn = jp_pcs0_2d, jp_pcs1_2d
+      DO jl = 1, jp_pisces_2d
+         jn = jp_pcs0_2d + jl - 1
          WRITE(ctrc2d(jn),'("2D_",I1)') jn                      ! short name
          WRITE(ctrc2l(jn),'("2D DIAGNOSTIC NUMBER ",I2)') jn    ! long name
@@ -133 +134 @@
       END DO
       !                                 ! 3D output arrays
-      DO jn = jp_pcs0_3d, jp_pcs1_3d
+      DO jl = 1, jp_pisces_3d
+         jn = jp_pcs0_3d + jl - 1
          WRITE(ctrc3d(jn),'("3D_",I1)') jn                      ! short name
          WRITE(ctrc3l(jn),'("3D DIAGNOSTIC NUMBER ",I2)') jn    ! long name
@@ -142 +144 @@
       READ  ( numnat, nampisdia )
 
-      DO jn = jp_pcs0_2d, jp_pcs1_2d
-         ctrc2d(jn) = pisdia2d(jn)%snamedia
-         ctrc2l(jn) = pisdia2d(jn)%lnamedia
-         ctrc2u(jn) = pisdia2d(jn)%unitdia
+      DO jl = 1, jp_pisces_2d
+         jn = jp_pcs0_2d + jl - 1
+         ctrc2d(jn) = pisdia2d(jl)%snamedia
+         ctrc2l(jn) = pisdia2d(jl)%lnamedia
+         ctrc2u(jn) = pisdia2d(jl)%unitdia
       END DO
 
-      DO jn = jp_pcs0_3d, jp_pcs1_3d
-         ctrc3d(jn) = pisdia3d(jn)%snamedia
-         ctrc3l(jn) = pisdia3d(jn)%lnamedia
-         ctrc3u(jn) = pisdia3d(jn)%unitdia
+      DO jl = 1, jp_pisces_3d
+         jn = jp_pcs0_3d + jl - 1
+         ctrc3d(jn) = pisdia3d(jl)%snamedia
+         ctrc3l(jn) = pisdia3d(jl)%lnamedia
+         ctrc3u(jn) = pisdia3d(jl)%unitdia
       END DO
 
@@ -158 +162 @@
          WRITE(numout,*) ' Namelist : natadd'
          WRITE(numout,*) '    frequency of outputs for additional arrays nwritedia = ', nwritedia
-         DO jn = jp_pcs0_3d, jp_pcs1_3d
+         DO jl = 1, jp_pisces_3d
+            jn = jp_pcs0_3d + jl - 1
             WRITE(numout,*) '   3d output field No : ',jn
             WRITE(numout,*) '   short name         : ', TRIM(ctrc3d(jn))
@@ -166 +171 @@
          END DO
 
-         DO jn = jp_pcs0_2d, jp_pcs1_2d
+         DO jl = 1, jp_pisces_2d
+            jn = jp_pcs0_2d + jl - 1
             WRITE(numout,*) '   2d output field No : ',jn
             WRITE(numout,*) '   short name         : ', TRIM(ctrc2d(jn))