Changeset 1703 for palm

Timestamp:

Nov 2, 2015 12:38:44 PM (9 years ago)

Author:

raasch

Message:

bugfix for output of single (*) xy-sections in case of parallel netcdf I/O

File:

• palm/trunk/SOURCE/data_output_2d.f90 (modified) (8 diffs)

palm/trunk/SOURCE/data_output_2d.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! bugfix for output of single (*) xy-sections in case of parallel netcdf I/O
 ! 
 ! Former revisions:
@@ -194 +194 @@
     INTEGER(iwp) ::  layer_xy  !< 
     INTEGER(iwp) ::  n         !< 
+    INTEGER(iwp) ::  nis       !<
     INTEGER(iwp) ::  ns        !< 
     INTEGER(iwp) ::  nzb_do    !< lower limit of the data field (usually nzb)
@@ -1478 +1479 @@
 !--                Hence exit loop of output levels.
                    IF ( two_d )  THEN
-                      two_d = .FALSE.
+                      IF ( netcdf_data_format < 5 )  two_d = .FALSE.
                       EXIT loop1
                    ENDIF
@@ -1936 +1937 @@
                    CASE ( 'xy' )
                       IF ( two_d ) THEN
-                         iis = 1
+                         nis = 1
+                         two_d = .FALSE.
                       ELSE
-                         iis = is-1
+                         nis = ns
                       ENDIF
 !
@@ -1947 +1949 @@
                                                  id_var_do2d(av,if),           &
                                                  local_2d_sections(nxl:nxr+1,  &
-                                                    nys:nyn,1:ns),             &
+                                                    nys:nyn,1:nis),            &
                                                  start = (/ nxl+1, nys+1, 1,   &
                                                     do2d_xy_time_count(av) /), &
                                                  count = (/ nxr-nxl+2,         &
-                                                            nyn-nys+1, ns, 1   &
+                                                            nyn-nys+1, nis, 1  &
                                                           /) )
                       ELSEIF ( nxr /= nx  .AND.  nyn == ny )  THEN
@@ -1957 +1959 @@
                                                  id_var_do2d(av,if),           &
                                                  local_2d_sections(nxl:nxr,    &
-                                                    nys:nyn+1,1:ns),           &
+                                                    nys:nyn+1,1:nis),          &
                                                  start = (/ nxl+1, nys+1, 1,   &
                                                     do2d_xy_time_count(av) /), &
                                                  count = (/ nxr-nxl+1,         &
-                                                            nyn-nys+2, ns, 1   &
+                                                            nyn-nys+2, nis, 1  &
                                                           /) )
                       ELSEIF ( nxr == nx  .AND.  nyn == ny )  THEN
@@ -1967 +1969 @@
                                                  id_var_do2d(av,if),           &
                                                  local_2d_sections(nxl:nxr+1,  &
-                                                    nys:nyn+1,1:ns),           &
+                                                    nys:nyn+1,1:nis),          &
                                                  start = (/ nxl+1, nys+1, 1,   &
                                                     do2d_xy_time_count(av) /), &
                                                  count = (/ nxr-nxl+2,         &
-                                                            nyn-nys+2, ns, 1   &
+                                                            nyn-nys+2, nis, 1  &
                                                           /) )
                       ELSE
@@ -1977 +1979 @@
                                                  id_var_do2d(av,if),           &
                                                  local_2d_sections(nxl:nxr,    &
-                                                    nys:nyn,1:ns),             &
+                                                    nys:nyn,1:nis),            &
                                                  start = (/ nxl+1, nys+1, 1,   &
                                                     do2d_xy_time_count(av) /), &
                                                  count = (/ nxr-nxl+1,         &
-                                                            nyn-nys+1, ns, 1   &
+                                                            nyn-nys+1, nis, 1  &
                                                           /) )
                       ENDIF