Changeset 3211 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.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/OBS/diaobs.F90 (modified) (6 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -19 +19 @@
    USE in_out_manager           ! I/O manager
    USE par_oce
-   USE dom_oce                  ! Ocean space and time domain variables
    USE obs_read_prof            ! Reading and allocation of observations (Coriolis)
    USE obs_read_sla             ! Reading and allocation of SLA observations  
@@ -105 +104 @@
    LOGICAL, DIMENSION(:), ALLOCATABLE :: &
       & ld_velav     !: Velocity data is daily averaged
+
+   !! * Control permutation of array indices
+#  include "dom_oce_ftrans.h90"
 
    !!----------------------------------------------------------------------
@@ -1023 +1025 @@
       USE wrk_nemo, ONLY: frld => wrk_2d_1
 #endif
+
+   !! * Control permutation of array indices
+!FTRANS CLEAR
+#  include "dom_oce_ftrans.h90"
+#  include "oce_ftrans.h90"
+
       IMPLICIT NONE
 
@@ -1081 +1089 @@
       IF ( ln_sla ) THEN
          DO jslaset = 1, nslasets
+#if defined key_z_first
+            CALL obs_sla_opt( sladatqc(jslaset),            &
+               &              kstp, jpi, jpj, nit000, sshn, &
+               &              tmask_1(:,:), n2dint )
+#else
             CALL obs_sla_opt( sladatqc(jslaset),            &
                &              kstp, jpi, jpj, nit000, sshn, &
                &              tmask(:,:,1), n2dint )
+#endif
          END DO         
       ENDIF
@@ -1090 +1104 @@
       IF ( ln_sst ) THEN
          DO jsstset = 1, nsstsets
+#if defined key_z_first
+            CALL obs_sst_opt( sstdatqc(jsstset),                 &
+               &              kstp, jpi, jpj, nit000, tn(:,:,1), &
+               &              tmask_1(:,:), n2dint )
+#else
             CALL obs_sst_opt( sstdatqc(jsstset),                 &
                &              kstp, jpi, jpj, nit000, tn(:,:,1), &
                &              tmask(:,:,1), n2dint )
+#endif
          END DO
       ENDIF
@@ -1427 +1447 @@
          & rdt
 
+   !! * Control permutation of array indices
+!FTRANS CLEAR
+
       IMPLICIT NONE