Changeset 7646 for trunk/NEMOGCM/TOOLS/SIREN/src/iom_cdf.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/TOOLS/SIREN/src/iom_cdf.f90 (modified) (17 diffs)

trunk/NEMOGCM/TOOLS/SIREN/src/iom_cdf.f90

@@ -316 +316 @@
    !> @author J.Paul
    !> @date November, 2013 - Initial Version
+   !> @date October, 2016
+   !> - define cdf4 as cdf.
    !
    !> @param[inout] td_file   file structure
@@ -340 +342 @@
             td_file%c_type='cdf'
          CASE(nf90_format_netcdf4, nf90_format_netcdf4_classic)
-            td_file%c_type='cdf4'
+            !td_file%c_type='cdf4'
+            td_file%c_type='cdf'
       END SELECT
 
@@ -351 +354 @@
    !> reorder dimension to ('x', 'y', 'z', 't').
    !> The dimension structure inside file structure is then completed.
-   !
-   !> @author J.Paul
-   !> @date November, 2013 - Initial Version
-   !
+   !>
+   !> @author J.Paul
+   !> @date November, 2013 - Initial Version
+   !> @date October, 2016
+   !> - check unknown dimension
+   !>
    !> @param[inout] td_file   file structure
    !-------------------------------------------------------------------
@@ -375 +380 @@
 
       IF( td_file%i_ndim > 0 )THEN
+
          ii=1
          DO ji = 1, td_file%i_ndim
             ! read dimension information
             tl_dim=iom_cdf_read_dim( td_file, ji)
-            IF( .NOT. dim_is_dummy(tl_dim) )THEN
+            ! sname == 'u' if dimension is unknown (not to be used)
+            IF( TRIM(tl_dim%c_sname) /= 'u' )THEN
                IF( ii > ip_maxdim )THEN
                   CALL logger_fatal("IOM CDF OPEN: too much dimension "//&
-                  & "to be read. you should remove dummy dimension using "//&
+                  & "to be read. you could choose dimension to be used. see "//&
                   & " configuration file")
                ENDIF
@@ -395 +402 @@
             &  " IOM CDF GET FILE DIM: there is no unlimited dimension in file "//&
             &  TRIM(td_file%c_name))
-         ELSE
-            td_file%t_dim( td_file%i_uldid )%l_uld=.TRUE.
+         !ELSE
+         !   td_file%t_dim( td_file%i_uldid )%l_uld=.TRUE.
          ENDIF
 
@@ -466 +473 @@
    !> The variable structure inside file structure is then completed.
    !> @note variable value are not read !
-   !
+   !>
    !> @author J.Paul
    !> @date November, 2013 - Initial Version
@@ -473 +480 @@
    !> @date January, 2016
    !> - increment n3d for 4D variable
-   !
+   !> @date October, 2016
+   !> - check if variable to be used (variable's dimension allowed and variable
+   !> not "dummy")
+   !>
    !> @param[inout] td_file   file structure
    !-------------------------------------------------------------------
@@ -501 +511 @@
          il_nvar=td_file%i_nvar
          ALLOCATE(tl_var(il_nvar))
-         ii=0
          DO ji = 1, il_nvar
            ! read variable information
            tl_var(ji)=iom_cdf__read_var_meta( td_file, ji) 
-           IF( .NOT. var_is_dummy(tl_var(ji)) )THEN
-              ii=ii+1
-           ENDIF
          ENDDO
 
          ! update number of variable used
-         td_file%i_nvar=ii
+         td_file%i_nvar=COUNT(tl_var(:)%l_use)
 
          ALLOCATE(td_file%t_var(td_file%i_nvar))
@@ -517 +523 @@
          ii=0
          DO ji = 1, il_nvar
-            IF( .NOT. var_is_dummy(tl_var(ji)) )THEN
+            IF( tl_var(ji)%l_use )THEN
                ii=ii+1
                td_file%t_var(ii)=var_copy(tl_var(ji))
@@ -552 +558 @@
                      td_file%i_timeid=ji
                   ELSE
+                     IF( td_file%i_timeid /= ji )THEN
+                        CALL logger_warn("IOM CDF GET FILE VAR: find more "//&
+                        &                 "than one time variable in file "//&
+                        &                 TRIM(td_file%c_name)//". see "//&
+                        &                 "dummy.cfg configuration file to"//&
+                        &                 " not used dummy variables.")
+                     ENDIF
                      il_attid=0
                      IF( ASSOCIATED(td_file%t_var(ii)%t_att) )THEN
@@ -558 +571 @@
                      IF( il_attid /= 0 )THEN
                         td_file%i_timeid=ji
-                     !ELSE
-                     !   CALL logger_error("IOM CDF GET FILE VAR: find more "//&
-                     !   &                 "than one time variable in file "//&
-                     !   &                 TRIM(td_file%c_name) )
                      ENDIF
                   ENDIF
@@ -652 +661 @@
          &  " IOM CDF READ DIM: no id associated to file "//TRIM(td_file%c_name))
 
-      ELSE      
+      ELSE
 
          CALL logger_trace( &
@@ -1413 +1422 @@
          ENDDO
 
+         !! check if variable is dummy
+         IF( var_is_dummy(iom_cdf__read_var_meta) )THEN
+            iom_cdf__read_var_meta%l_use=.FALSE.
+         ENDIF
+
+         !! check if all dimensions are allowed
+         DO ji=1,il_ndim
+            IF( ALL(td_file%t_dim(:)%i_id /= il_dimid(ji)) )THEN
+               iom_cdf__read_var_meta%l_use=.FALSE.
+            ENDIF
+         ENDDO
+
          ! clean
          CALL dim_clean(tl_dim(:))
@@ -1484 +1505 @@
       ELSE IF( id_ndim > 0 )THEN
 
-
          ii=1
          DO ji = 1, id_ndim
 
-            !!! check no dummy dimension to be used
+            ! check if dimension to be used, is allowed
             IF( ANY(td_file%t_dim(:)%i_id == id_dimid(ji)) )THEN
                IF( ii > ip_maxdim )THEN
@@ -1500 +1520 @@
 
                il_xyzt2(ii)=td_file%t_dim(id_dimid(ji))%i_xyzt2
-
+               
                ! read dimension information
                tl_dim(ii) = dim_init( td_file%t_dim(il_xyzt2(ii))%c_name, &
                &                      td_file%t_dim(il_xyzt2(ii))%i_len )
-            
+
                ii=ii+1
             ELSE
@@ -2080 +2100 @@
                   & 'gcost','gcosu','gcosv','gcosf', &
                   & 'gsint','gsinu','gsinv','gsinf', &
-                  & 'mbathy','misf','isf_draft',     &
+                  & 'mbathy','misf','isf_draft','isfdraft',     &
                   & 'hbatt','hbatu','hbatv','hbatf', &
                   & 'gsigt','gsigu','gsigv','gsigf', &
@@ -2189 +2209 @@
          CALL iom_cdf__check(il_status,"IOM CDF WRITE VAR DEF: ")
       ENDIF
+      CALL logger_debug("IOM CDF WRITE VAR DEF: type = "//TRIM(fct_str(tl_var%i_type)))
 
       ! remove unuseful attribute