Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

@@ -13 +13 @@
    !!   obs_sor       : Sort the observation arrays
    !!---------------------------------------------------------------------
-   !! * Modules used
-   USE par_kind, ONLY : & ! Precision variables
-      & wp   
+   USE par_kind, ONLY : wp ! Precision variables
    USE in_out_manager     ! I/O manager
    USE obs_profiles_def   ! Definitions for storage arrays for profiles
@@ -24 +22 @@
    USE obs_inter_sup      ! Interpolation support
    USE obs_oper           ! Observation operators
-   USE lib_mpp, ONLY : &
-      & ctl_warn, ctl_stop
+   USE lib_mpp, ONLY :   ctl_warn, ctl_stop
 
    IMPLICIT NONE
-
-   !! * Routine accessibility
    PRIVATE
 
-   PUBLIC &
-      & obs_pre_prof, &    ! First level check and screening of profile obs
-      & obs_pre_surf, &    ! First level check and screening of surface obs
-      & calc_month_len     ! Calculate the number of days in the months of a year
+   PUBLIC   obs_pre_prof     ! First level check and screening of profile obs
+   PUBLIC   obs_pre_surf     ! First level check and screening of surface obs
+   PUBLIC   calc_month_len   ! Calculate the number of days in the months of a year
 
    !!----------------------------------------------------------------------
@@ -63 +57 @@
       !!        !  2015-02  (M. Martin) Combined routine for surface types.
       !!----------------------------------------------------------------------
-      !! * Modules used
-      USE domstp              ! Domain: set the time-step
       USE par_oce             ! Ocean parameters
-      USE dom_oce, ONLY : &   ! Geographical information
-         & glamt,   &
-         & gphit,   &
-         & tmask,   &
-         & nproc
+      USE dom_oce, ONLY       :   glamt, gphit, tmask, nproc   ! Geographical information
       !! * Arguments
       TYPE(obs_surf), INTENT(INOUT) :: surfdata    ! Full set of surface data
       TYPE(obs_surf), INTENT(INOUT) :: surfdataqc   ! Subset of surface data not failing screening
       LOGICAL, INTENT(IN) :: ld_nea         ! Switch for rejecting observation near land
-      !! * Local declarations
+      !
       INTEGER :: iyea0        ! Initial date
       INTEGER :: imon0        !  - (year, month, day, hour, minute)
@@ -94 +82 @@
       INTEGER :: inlasobsmpp    !  - close to land
       INTEGER :: igrdobsmpp     !  - fail the grid search
-      LOGICAL, DIMENSION(:), ALLOCATABLE :: & 
-         & llvalid            ! SLA data selection
+      LOGICAL, DIMENSION(:), ALLOCATABLE ::   llvalid            ! SLA data selection
       INTEGER :: jobs         ! Obs. loop variable
       INTEGER :: jstp         ! Time loop variable
       INTEGER :: inrc         ! Time index variable
-
-      IF(lwp) WRITE(numout,*)'obs_pre_surf : Preparing the surface observations...'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
+      !!----------------------------------------------------------------------
+
+      IF(lwp) WRITE(numout,*) 'obs_pre_surf : Preparing the surface observations...'
+      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
       
       ! Initial date initialization (year, month, day, hour, minute)
@@ -253 +241 @@
       !!
       !!----------------------------------------------------------------------
-      !! * Modules used
-      USE domstp              ! Domain: set the time-step
-      USE par_oce             ! Ocean parameters
-      USE dom_oce, ONLY : &   ! Geographical information
-         & gdept_1d,             &
-         & nproc
+      USE par_oce           ! Ocean parameters
+      USE dom_oce, ONLY :   gdept_1d, nproc   ! Geographical information
 
       !! * Arguments
@@ -314 +298 @@
       INTEGER :: jstp         ! Time loop variable
       INTEGER :: inrc         ! Time index variable
+      !!----------------------------------------------------------------------
 
       IF(lwp) WRITE(numout,*)'obs_pre_prof: Preparing the profile data...'