Changeset 1783 for palm/trunk/SOURCE/data_output_2d.f90

Timestamp:

Mar 6, 2016 6:36:17 PM (8 years ago)

Author:

raasch

Message:

NetCDF routines modularized; new parameter netcdf_deflate; further changes in the pmc

File:

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

palm/trunk/SOURCE/data_output_2d.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! name change of netcdf routines and module + related changes
 ! 
 ! Former revisions:
@@ -141 +141 @@
                do2d_yz_last_time, do2d_yz_n, do2d_yz_time_count,               &
                ibc_uv_b, icloud_scheme, io_blocks, io_group,                   &
-               message_string, netcdf_data_format,                             &
+               message_string,                             &
                ntdim_2d_xy, ntdim_2d_xz, ntdim_2d_yz, psolver, section,        &
                simulated_time,  simulated_time_chr, time_since_reference_point
@@ -165 +165 @@
                shf_eb_av, t_soil, t_soil_av, zs
     
-    USE netcdf_control
+#if defined( __netcdf )
+    USE NETCDF
+#endif
+
+    USE netcdf_interface,                                                      &
+        ONLY:  id_set_xy, id_set_xz, id_set_yz, id_var_do2d, id_var_time_xy,   &
+               id_var_time_xz, id_var_time_yz, nc_stat, netcdf_data_format,    &
+               netcdf_handle_error
 
     USE particle_attributes,                                                   &
@@ -1322 +1329 @@
                                          start = (/ do2d_xy_time_count(av) /), &
                                                     count = (/ 1 /) )
-                            CALL handle_netcdf_error( 'data_output_2d', 53 )
+                            CALL netcdf_handle_error( 'data_output_2d', 53 )
 #endif
                          ENDIF
@@ -1443 +1450 @@
                                              count = (/ nx+2, ny+2, 1, 1 /) )
                             ENDIF
-                            CALL handle_netcdf_error( 'data_output_2d', 54 )
+                            CALL netcdf_handle_error( 'data_output_2d', 54 )
 #endif
 
@@ -1481 +1488 @@
                                            count = (/ nx+2, ny+2, 1, 1 /) )
                    ENDIF
-                   CALL handle_netcdf_error( 'data_output_2d', 447 )
+                   CALL netcdf_handle_error( 'data_output_2d', 447 )
 #endif
 #endif
@@ -1511 +1518 @@
                                          start = (/ do2d_xz_time_count(av) /), &
                                                     count = (/ 1 /) )
-                            CALL handle_netcdf_error( 'data_output_2d', 56 )
+                            CALL netcdf_handle_error( 'data_output_2d', 56 )
 #endif
                          ENDIF
@@ -1666 +1673 @@
                             start = (/ 1, is, 1, do2d_xz_time_count(av) /), &
                                              count = (/ nx+2, 1, nzt_do-nzb_do+1, 1 /) )
-                            CALL handle_netcdf_error( 'data_output_2d', 58 )
+                            CALL netcdf_handle_error( 'data_output_2d', 58 )
 #endif
 
@@ -1707 +1714 @@
                             start = (/ 1, is, 1, do2d_xz_time_count(av) /), &
                                            count = (/ nx+2, 1, nzt_do-nzb_do+1, 1 /) )
-                   CALL handle_netcdf_error( 'data_output_2d', 451 )
+                   CALL netcdf_handle_error( 'data_output_2d', 451 )
 #endif
 #endif
@@ -1730 +1737 @@
                                          start = (/ do2d_yz_time_count(av) /), &
                                                     count = (/ 1 /) )
-                            CALL handle_netcdf_error( 'data_output_2d', 59 )
+                            CALL netcdf_handle_error( 'data_output_2d', 59 )
 #endif
                          ENDIF
@@ -1885 +1892 @@
                             start = (/ is, 1, 1, do2d_yz_time_count(av) /), &
                                              count = (/ 1, ny+2, nzt_do-nzb_do+1, 1 /) )
-                            CALL handle_netcdf_error( 'data_output_2d', 61 )
+                            CALL netcdf_handle_error( 'data_output_2d', 61 )
 #endif
 
@@ -1926 +1933 @@
                             start = (/ is, 1, 1, do2d_xz_time_count(av) /), &
                                            count = (/ 1, ny+2, nzt_do-nzb_do+1, 1 /) )
-                   CALL handle_netcdf_error( 'data_output_2d', 452 )
+                   CALL netcdf_handle_error( 'data_output_2d', 452 )
 #endif
 #endif
@@ -1997 +2004 @@
                       ENDIF    
 
-                      CALL handle_netcdf_error( 'data_output_2d', 55 ) 
+                      CALL netcdf_handle_error( 'data_output_2d', 55 )
 
                    CASE ( 'xz' )
@@ -2047 +2054 @@
                       ENDIF
 
-                      CALL handle_netcdf_error( 'data_output_2d', 57 )
+                      CALL netcdf_handle_error( 'data_output_2d', 57 )
 
                    CASE ( 'yz' )
@@ -2097 +2104 @@
                       ENDIF
 
-                      CALL handle_netcdf_error( 'data_output_2d', 60 )
+                      CALL netcdf_handle_error( 'data_output_2d', 60 )
 
                    CASE DEFAULT