Changeset 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/SIREN/src/iom_mpp.f90

Timestamp:

2018-10-29T15:20:26+01:00 (5 years ago)

Author:

kingr

Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:

• branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/SIREN/src/iom_mpp.f90 (modified) (16 diffs)

branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/SIREN/src/iom_mpp.f90

@@ -87 +87 @@
 !> J.Paul
 ! REVISION HISTORY:
-!> @date November, 2013 - Initial Version
+!> @date Nov, 2013 - Initial Version
 !>
 !> @note Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -137 +137 @@
    !>
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !
    !> @param[inout] td_mpp mpp structure
@@ -161 +161 @@
 
       ELSE
-         ! 
-         td_mpp%i_id=1
-
          ! if no processor file selected
          ! force to open all files 
@@ -224 +221 @@
    !> 
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !
    !> @param[inout] td_mpp mpp structure
@@ -251 +248 @@
    !>
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !
    !> @param[in] td_mpp mpp structure
@@ -270 +267 @@
 
       ELSE
-         ! 
-         td_mpp%i_id=0         
-
          DO ji=1,td_mpp%i_nproc
             IF( td_mpp%t_proc(ji)%i_id /= 0 )THEN
@@ -291 +285 @@
    !>
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !> @date October, 2014
    !> - use start and count array instead of domain structure.
@@ -320 +314 @@
          &               " in mpp strcuture "//TRIM(td_mpp%c_name))
 
-      ELSEIF( td_mpp%i_id == 0 )THEN
-
-         CALL logger_error( " IOM MPP READ VAR: mpp structure not opened. "//&
-         &               " can not read variable in "//TRIM(td_mpp%c_name))   
-      
       ELSE
-
 
          IF( ANY(td_mpp%t_proc(:)%i_id /= 0) )THEN
@@ -367 +355 @@
    !
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !> @date October, 2014
    !> - use start and count array instead of domain structure.
@@ -396 +384 @@
          &               " in mpp strcuture "//TRIM(td_mpp%c_name))
 
-      ELSEIF( td_mpp%i_id == 0 )THEN
-
-         CALL logger_error( " IOM MPP READ VAR: mpp structure not opened. "//&
-         &               " can not read variable in "//TRIM(td_mpp%c_name))   
-      
       ELSE
 
@@ -417 +400 @@
                CALL logger_error( &
                &  " IOM MPP READ VAR: there is no variable with "//&
-               &  "name or standard name "//TRIM(cd_name)//&
+               &  "name or standard name"//TRIM(cd_name)//&
                &  " in processor/file "//TRIM(td_mpp%t_proc(1)%c_name))
             ENDIF
@@ -433 +416 @@
    !
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !> @date October, 2014
    !> - use start and count array instead of domain structure.
@@ -484 +467 @@
       IF( PRESENT(id_count) ) il_count(:)=id_count(:)
 
-      CALL logger_debug("IOM MPP READ VAR VALUE: start "//&
-               &  TRIM(fct_str(il_start(jp_I)))//","//&
-               &  TRIM(fct_str(il_start(jp_J)))//","//&
-               &  TRIM(fct_str(il_start(jp_K)))//","//&
-               &  TRIM(fct_str(il_start(jp_L))) )
-      CALL logger_debug("IOM MPP READ VAR VALUE: count "//&
-               &  TRIM(fct_str(il_count(jp_I)))//","//&
-               &  TRIM(fct_str(il_count(jp_J)))//","//&
-               &  TRIM(fct_str(il_count(jp_K)))//","//&
-               &  TRIM(fct_str(il_count(jp_L))) )
-
       DO jk=1,ip_maxdim
          IF( .NOT. td_var%t_dim(jk)%l_use )THEN
@@ -504 +476 @@
       ENDDO
 
+
       IF( ANY(il_end(:) > td_mpp%t_dim(:)%i_len) )THEN
-            CALL logger_debug("IOM MPP READ VAR VALUE: start + count "//&
-               &  TRIM(fct_str(il_end(jp_I)))//","//&
-               &  TRIM(fct_str(il_end(jp_J)))//","//&
-               &  TRIM(fct_str(il_end(jp_K)))//","//&
-               &  TRIM(fct_str(il_end(jp_L))) )
-            CALL logger_debug("IOM MPP READ VAR VALUE: dimension "//&
-               &  TRIM(fct_str(td_mpp%t_dim(jp_I)%i_len))//","//&
-               &  TRIM(fct_str(td_mpp%t_dim(jp_J)%i_len))//","//&
-               &  TRIM(fct_str(td_mpp%t_dim(jp_K)%i_len))//","//&
-               &  TRIM(fct_str(td_mpp%t_dim(jp_L)%i_len)) )
             CALL logger_fatal("IOM MPP READ VAR VALUE: start + count "//&
             &                 "exceed dimension bound.")
@@ -620 +583 @@
    !
    !> @details
-   !> optionally, you could specify the dimension order (default 'xyzt')
    !
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
-   !> @date July, 2015 - add dimension order option 
+   !> - November, 2013- Initial Version
    !
    !> @param[inout] td_mpp mpp structure
-   !> @param[In] cd_dimorder dimension order
-   !-------------------------------------------------------------------
-   SUBROUTINE iom_mpp_write_file(td_mpp, cd_dimorder)
+   !-------------------------------------------------------------------
+   SUBROUTINE iom_mpp_write_file(td_mpp)
       IMPLICIT NONE
       ! Argument      
-      TYPE(TMPP)      , INTENT(INOUT) :: td_mpp
-      CHARACTER(LEN=*), INTENT(IN   ), OPTIONAL :: cd_dimorder
+      TYPE(TMPP), INTENT(INOUT) :: td_mpp
 
       ! local variable
@@ -651 +610 @@
                !CALL file_del_att(td_mpp%t_proc(ji), 'ew_overlap')
 
-               CALL iom_write_file(td_mpp%t_proc(ji), cd_dimorder)
+               CALL iom_write_file(td_mpp%t_proc(ji))
             ELSE
                CALL logger_debug( " MPP WRITE: no id associated to file "//&