Changeset 3211 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90

Timestamp:

2011-12-11T16:00:26+01:00 (13 years ago)

Author:

spickles2

Message:

Stephen Pickles, 11 Dec 2011

Commit to bring the rest of the DCSE NEMO development branch
in line with the latest development version. This includes
array index re-ordering of all OPA_SRC/.

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90 (modified) (2 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -32 +32 @@
 
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sal   ! structure of input SST (file informations, fields read)
+
+   !! * Control permutation of array indices
+#  include "dtasal_ftrans.h90"
+#  include "oce_ftrans.h90"
+#  include "dom_oce_ftrans.h90"
 
    !! * Substitutions
@@ -158 +163 @@
 #endif   
         
-      s_dta(:,:,:)=sf_sal(1)%fnow(:,:,:)
+#if defined key_z_first
+      !! DCSE_NEMO: Beware! These arrays will not be conformable after permuting indices of t_dta
+      DO jk = 1, jpk
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               s_dta(ji,jj,jk) = sf_sal(1)%fnow(ji,jj,jk)
+            END DO
+         END DO
+      END DO
+#else
+      s_dta(:,:,:) = sf_sal(1)%fnow(:,:,:)
+#endif
         
       IF( ln_sco ) THEN
-         DO jj = 1, jpj                  ! interpolation of salinites
+         DO jj = 1, jpj                  ! interpolation of salinities
             DO ji = 1, jpi
                DO jk = 1, jpk