Changeset 2964 for palm/trunk/SOURCE/netcdf_interface_mod.f90

Timestamp:

Apr 12, 2018 4:04:03 PM (6 years ago)

Author:

Giersch

Message:

Bugfix in the calculation of fixed number of output time levels for parallel netcdf output, error message related to reading sky view factors revised

File:

• palm/trunk/SOURCE/netcdf_interface_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/netcdf_interface_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Calculation of fixed number of output time levels for parallel netcdf output
+! has been moved completely to check_parameters
+! 
+! 2932 2018-03-26 09:39:22Z maronga
 ! Renamed inipar to initialization_parameters.
 ! 
@@ -1830 +1834 @@
           IF ( netcdf_data_format > 4 )  THEN
 !
-!--          Set needed time levels (ntdim) to 
-!--          saved time levels + to be saved time levels.
-             IF ( av == 0 )  THEN 
-                ntdim_3d(0) = do3d_time_count(0) + CEILING(                &
-                              ( end_time - MAX( skip_time_do3d,            &
-                                                simulated_time_at_begin )  &
-                              ) / dt_do3d )
-                IF ( do3d_at_begin )  ntdim_3d(0) = ntdim_3d(0) + 1
-             ELSE
-                ntdim_3d(1) = do3d_time_count(1) + CEILING(                &
-                              ( end_time - MAX( skip_time_data_output_av,  &
-                                                simulated_time_at_begin )  &
-                              ) / dt_data_output_av )
-             ENDIF
-
-!
 !--          Check if the needed number of output time levels is increased
 !--          compared to the number of time levels in the existing file.
@@ -2606 +2594 @@
           IF ( netcdf_data_format > 4 )  THEN
 !
-!--          Set needed time levels (ntdim) to 
-!--          saved time levels + to be saved time levels.
-             IF ( av == 0 )  THEN 
-                ntdim_2d_xy(0) = do2d_xy_time_count(0) + CEILING(             &
-                                 ( end_time - MAX( skip_time_do2d_xy,         &
-                                                   simulated_time_at_begin )  &
-                                 ) / dt_do2d_xy )
-                IF ( do2d_at_begin )  ntdim_2d_xy(0) = ntdim_2d_xy(0) + 1
-             ELSE
-                ntdim_2d_xy(1) = do2d_xy_time_count(1) + CEILING(             &
-                                 ( end_time - MAX( skip_time_data_output_av,  &
-                                                   simulated_time_at_begin )  &
-                                 ) / dt_data_output_av )
-             ENDIF
-
-!
 !--          Check if the needed number of output time levels is increased
 !--          compared to the number of time levels in the existing file.
@@ -3265 +3237 @@
           IF ( netcdf_data_format > 4 )  THEN
 !
-!--          Set needed time levels (ntdim) to 
-!--          saved time levels + to be saved time levels.
-             IF ( av == 0 )  THEN 
-                ntdim_2d_xz(0) = do2d_xz_time_count(0) + CEILING(             &
-                                 ( end_time - MAX( skip_time_do2d_xz,         &
-                                                   simulated_time_at_begin )  &
-                                 ) / dt_do2d_xz )
-                IF ( do2d_at_begin )  ntdim_2d_xz(0) = ntdim_2d_xz(0) + 1
-             ELSE
-                ntdim_2d_xz(1) = do2d_xz_time_count(1) + CEILING(             &
-                                 ( end_time - MAX( skip_time_data_output_av,  &
-                                                   simulated_time_at_begin )  &
-                                 ) / dt_data_output_av )
-             ENDIF
-
-!
 !--          Check if the needed number of output time levels is increased
 !--          compared to the number of time levels in the existing file.
@@ -3927 +3883 @@
           IF ( netcdf_data_format > 4 )  THEN
 !
-!--          Set needed time levels (ntdim) to 
-!--          saved time levels + to be saved time levels.
-             IF ( av == 0 )  THEN 
-                ntdim_2d_yz(0) = do2d_yz_time_count(0) + CEILING(             &
-                                 ( end_time - MAX( skip_time_do2d_yz,         &
-                                                   simulated_time_at_begin )  &
-                                 ) / dt_do2d_yz )
-                IF ( do2d_at_begin )  ntdim_2d_yz(0) = ntdim_2d_yz(0) + 1
-             ELSE
-                ntdim_2d_yz(1) = do2d_yz_time_count(1) + CEILING(             &
-                                 ( end_time - MAX( skip_time_data_output_av,  &
-                                                   simulated_time_at_begin )  &
-                                 ) / dt_data_output_av )
-             ENDIF
-
-!
 !--          Check if the needed number of output time levels is increased
 !--          compared to the number of time levels in the existing file.