Changeset 7646 for trunk/NEMOGCM/NEMO/SAO_SRC/sao_read.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/SAO_SRC/sao_read.F90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/SAO_SRC/sao_read.F90

@@ -1 +1 @@
 MODULE sao_read
-   !!==================================================================
-   !!                    *** MODULE sao_read ***
+   !!======================================================================
+   !!                      ***  MODULE sao_read  ***
    !! Read routines : I/O for Stand Alone Observation operator
-   !!==================================================================
+   !!======================================================================
    USE mppini
    USE lib_mpp
@@ -12 +12 @@
    USE dom_oce, ONLY: nlci, nlcj, nimpp, njmpp, tmask
    USE par_oce, ONLY: jpi, jpj, jpk
+   !
    USE obs_fbm, ONLY: fbimdi, fbrmdi, fbsp, fbdp
    USE sao_data
@@ -20 +21 @@
    PUBLIC sao_rea_dri
 
+   !!----------------------------------------------------------------------
+   !! NEMO/OPA 3.7 , NEMO Consortium (2015)
+   !! $Id: trazdf_imp.F90 6140 2015-12-21 11:35:23Z timgraham $
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE sao_rea_dri(kfile)
+
+   SUBROUTINE sao_rea_dri( kfile )
       !!------------------------------------------------------------------------
       !!             *** sao_rea_dri ***
@@ -31 +38 @@
       !!
       !!------------------------------------------------------------------------
-      INTEGER, INTENT(IN) :: &
-              & kfile         !: File number
-      CHARACTER(len=lc) :: &
-              & cdfilename    !: File name
-      INTEGER :: &
-              & kindex        !: File index to read
-
-      cdfilename = TRIM(sao_files(kfile))
+      INTEGER, INTENT(in) ::   kfile         ! File number
+      !
+      CHARACTER(len=lc)   ::   cdfilename    ! File name
+      INTEGER ::   kindex        ! File index to read
+      !!------------------------------------------------------------------------
+      !
+      cdfilename = TRIM( sao_files(kfile) )
       kindex = nn_sao_idx(kfile)
-      CALL sao_read_file(TRIM(cdfilename), kindex)
-
+      CALL sao_read_file( TRIM( cdfilename ), kindex )
+      !
    END SUBROUTINE sao_rea_dri
 
-   SUBROUTINE sao_read_file(filename, ifcst)
+
+   SUBROUTINE sao_read_file( filename, ifcst )
       !!------------------------------------------------------------------------
-      !!             *** sao_read_file ***
+      !!                         ***  sao_read_file  ***
       !!
       !! Purpose : To fill tn and sn with dailymean field from netcdf files
@@ -54 +61 @@
       !! Author  : A. Ryan Oct 2010
       !!------------------------------------------------------------------------
-
-      INTEGER,          INTENT(IN) :: ifcst
-      CHARACTER(len=*), INTENT(IN) :: filename
-      INTEGER                      :: ncid, &
-                                    & varid,&
-                                    & istat,&
-                                    & ntimes,&
-                                    & tdim, &
-                                    & xdim, &
-                                    & ydim, &
-                                    & zdim
-      INTEGER                      :: ii, ij, ik
-      INTEGER, DIMENSION(4)        :: start_n, &
-                                    & count_n
-      INTEGER, DIMENSION(3)        :: start_s, &
-                                    & count_s
-      REAL(fbdp), DIMENSION(:,:,:),ALLOCATABLE :: temp_tn, &
-                                              & temp_sn
-      REAL(fbdp), DIMENSION(:,:),  ALLOCATABLE :: temp_sshn
-      REAL(fbdp)                     :: fill_val
+      INTEGER,          INTENT(in) ::   ifcst
+      CHARACTER(len=*), INTENT(in) ::   filename
+      INTEGER                      ::   ncid, varid, istat, ntimes
+      INTEGER                      ::   tdim, xdim, ydim, zdim
+      INTEGER                      ::   ii, ij, ik
+      INTEGER, DIMENSION(4)        ::   start_n, count_n
+      INTEGER, DIMENSION(3)        ::   start_s, count_s
+      REAL(fbdp)                   ::   fill_val
+      REAL(fbdp), DIMENSION(:,:,:), ALLOCATABLE ::   temp_tn, temp_sn
+      REAL(fbdp), DIMENSION(:,:)  , ALLOCATABLE ::   temp_sshn
 
       ! DEBUG
-      INTEGER :: istage
+      INTEGER ::   istage
+      !!------------------------------------------------------------------------
 
       IF (TRIM(filename) == 'nofile') THEN
-         tsn(:,:,:,:) = fbrmdi
-         sshn(:,:) = fbrmdi
+         tsn (:,:,:,:) = fbrmdi
+         sshn(:,:)     = fbrmdi
       ELSE
          WRITE(numout,*) "Opening :", TRIM(filename)
@@ -169 +167 @@
          istat = nf90_close(ncid)
       END IF
+      !
    END SUBROUTINE sao_read_file
+   
+   !!------------------------------------------------------------------------
 END MODULE sao_read