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

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

@@ -42 +42 @@
       & obs_pre_vel, &     ! First level check and screening of velocity profiles
       & calc_month_len     ! Calculate the number of days in the months of a year  
+
+   !! * Control permutation of array indices
+   !! No arrays with indices to permute.
 
    !!----------------------------------------------------------------------
@@ -356 +359 @@
       USE domstp              ! Domain: set the time-step
       USE par_oce             ! Ocean parameters
+#if defined key_z_first
+      USE dom_oce, ONLY : &   ! Geographical information
+         & glamt,   &
+         & gphit,   &
+         & tmask,   &
+         & tmask_1, &
+         & nproc
+#else
       USE dom_oce, ONLY : &   ! Geographical information
          & glamt,   &
@@ -361 +372 @@
          & tmask,   &
          & nproc
+#endif
+
+   !! * Control permutation of array indices
+#  include "dom_oce_ftrans.h90"
+
       !! * Arguments
       TYPE(obs_surf), INTENT(INOUT) :: sladata    ! Full set of SLA data
@@ -440 +456 @@
          &                 sladata%rlam, sladata%rphi, &
          &                 glamt,        gphit,        &
+#if defined key_z_first
+         &                 tmask_1(:,:), sladata%nqc,  &
+#else
          &                 tmask(:,:,1), sladata%nqc,  &
+#endif
          &                 iosdsobs,     ilansobs,     &
          &                 inlasobs,     ld_nea        )
@@ -526 +546 @@
    END SUBROUTINE obs_pre_sla
 
+   !! * Reset control of array index permutation
+!FTRANS CLEAR
+   !! No arrays with indices to permute.
+
    SUBROUTINE obs_pre_sst( sstdata, sstdatqc, ld_sst, ld_nea )
       !!----------------------------------------------------------------------
@@ -544 +568 @@
       USE domstp              ! Domain: set the time-step
       USE par_oce             ! Ocean parameters
+#if defined key_z_first
+      USE dom_oce, ONLY : &   ! Geographical information
+         & glamt,   &
+         & gphit,   &
+         & tmask,   &
+         & tmask_1, &
+         & nproc
+#else
       USE dom_oce, ONLY : &   ! Geographical information
          & glamt,   &
@@ -549 +581 @@
          & tmask,   &
          & nproc
+#endif
+
+   !! * Control permutation of array indices
+#  include "dom_oce_ftrans.h90"
+
       !! * Arguments
       TYPE(obs_surf), INTENT(INOUT) :: sstdata     ! Full set of SST data
@@ -625 +662 @@
          &                 sstdata%rlam, sstdata%rphi, &
          &                 glamt,        gphit,        &
+#if defined key_z_first
+         &                 tmask_1(:,:), sstdata%nqc,  &
+#else
          &                 tmask(:,:,1), sstdata%nqc,  &
+#endif
          &                 iosdsobs,     ilansobs,     &
          &                 inlasobs,     ld_nea        )
@@ -711 +752 @@
    END SUBROUTINE obs_pre_sst
 
+   !! * Reset control of array index permutation
+!FTRANS CLEAR
+   !! No arrays with indices to permute.
+
    SUBROUTINE obs_pre_seaice( seaicedata, seaicedatqc, ld_seaice, ld_nea )
       !!----------------------------------------------------------------------
@@ -733 +778 @@
          & gphit,   &
          & tmask,   &
+#if defined key_z_first
+         & tmask_1, &
+#endif
          & nproc
+
+      !! * Control permutation of array indices
+#  include "dom_oce_ftrans.h90"
+
       !! * Arguments
       TYPE(obs_surf), INTENT(INOUT) :: seaicedata     ! Full set of Sea Ice data
@@ -810 +862 @@
          &                 seaicedata%rlam, seaicedata%rphi, &
          &                 glamt,           gphit,           &
+#if defined key_z_first
+         &                 tmask_1(:,:),    seaicedata%nqc,  &
+#else
          &                 tmask(:,:,1),    seaicedata%nqc,  &
+#endif
          &                 iosdsobs,        ilansobs,        &
          &                 inlasobs,        ld_nea           )
@@ -896 +952 @@
    END SUBROUTINE obs_pre_seaice
 
+   !! * Reset control of array index permutation
+!FTRANS CLEAR
+   !! No arrays with indices to permute.
+
    SUBROUTINE obs_pre_vel( profdata, prodatqc, ld_vel3d, ld_nea, ld_dailyav )
       !!----------------------------------------------------------------------
@@ -919 +979 @@
          & tmask, umask, vmask,  &
          & nproc
+
+      !! * Control permutation of array indices
+#  include "dom_oce_ftrans.h90"
+
       !! * Arguments
       TYPE(obs_prof), INTENT(INOUT) :: profdata   ! Full set of profile data
@@ -1188 +1252 @@
    END SUBROUTINE obs_pre_vel
 
+   !! * Reset control of array index permutation
+!FTRANS CLEAR
+   !! No arrays with indices to permute.
+
    SUBROUTINE obs_coo_tim( kcycle, &
       &                    kyea0,   kmon0,   kday0,   khou0,   kmin0,     &
@@ -1710 +1778 @@
       USE dom_oce, ONLY : &       ! Geographical information
          & gdepw_0                        
+
+   !! * Control permutation of array indices
+#  include "dom_oce_ftrans.h90"
 
       !! * Arguments
@@ -1868 +1939 @@
    END SUBROUTINE obs_coo_spc_3d
 
+   !! * Reset control of array index permutation
+!FTRANS CLEAR
+   !! No arrays with indices to permute.
+
    SUBROUTINE obs_pro_rej( profdata )
       !!----------------------------------------------------------------------