Changeset 1808 for palm/trunk/UTIL

Timestamp:

Apr 5, 2016 7:44:00 PM (9 years ago)

Author:

raasch

Message:

preprocessor directives using machine dependent flags (lc, ibm, etc.) mostly removed from the code

File:

• palm/trunk/UTIL/combine_plot_fields.f90 (modified) (6 diffs)

palm/trunk/UTIL/combine_plot_fields.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! cpu measurements are done with standard FORTRAN routine on every machine
 ! 
 ! Former revisions:
@@ -107 +107 @@
                      ze, zza, zze
 
-#if defined( __lc ) || defined( __decalpha )
-    INTEGER(8)                  ::  count, count_rate
-#elif defined( __nec )
-    INTEGER(iwp)                ::  count, count_rate
-#elif defined( __ibm )
-    INTEGER(8)                  ::  IRTC
-#endif
+    INTEGER(8)                        ::  count, count_rate
 
     INTEGER(iwp), DIMENSION(0:1)      ::  current_level, current_var,          &
@@ -180 +174 @@
 !
 !--       Take current time
-#if defined( __lc ) || defined( __decalpha ) || defined( __nec )
           CALL SYSTEM_CLOCK( count, count_rate )
           cpu_start_time = REAL( count ) / REAL( count_rate )
-#elif defined( __ibm )
-          cpu_start_time = IRTC( ) * 1E-9
-#else
-          PRINT*,  '+++ INFORMATIVE: no time measurement defined on this host'
-#endif
 
           netcdf_parallel = .FALSE.
@@ -553 +541 @@
 !--       Output required cpu time
           IF ( danz /= 0  .AND.  .NOT. netcdf_parallel )  THEN
-#if defined( __lc ) || defined( __decalpha ) || defined( __nec )
              CALL SYSTEM_CLOCK( count, count_rate )
              cpu_end_time = REAL( count ) / REAL( count_rate )
              WRITE (*,'(5X,A,F9.3,A)')  'Required cpu-time: ', &
                                         cpu_end_time-cpu_start_time, ' sec'
-#elif defined( __ibm )
-             cpu_end_time = IRTC( ) * 1E-9
-             WRITE (*,'(5X,A,F9.3,A)')  'Required cpu-time: ', &
-                                        cpu_end_time-cpu_start_time, ' sec'
-#else
-             CONTINUE
-#endif
           ENDIF
 
@@ -592 +572 @@
 !
 !--    Take current time
-#if defined( __lc ) || defined( __decalpha ) || defined( __nec )
        CALL SYSTEM_CLOCK( count, count_rate )
        cpu_start_time = REAL( count ) / REAL( count_rate )
-#elif defined( __ibm )
-       cpu_start_time = IRTC( ) * 1E-9
-#else
-       PRINT*,  '+++ INFORMATIVE: no time measurement defined on this host'
-#endif
 
 !
@@ -885 +859 @@
 !
 !--       Output required cpu time
-#if defined( __lc ) || defined( __decalpha ) || defined( __nec )
           CALL SYSTEM_CLOCK( count, count_rate )
           cpu_end_time = REAL( count ) / REAL( count_rate )
           WRITE (*,'(5X,A,F9.3,A)')  'Required cpu-time: ', &
                                      cpu_end_time-cpu_start_time, ' sec'
-#elif defined( __ibm )
-          cpu_end_time = IRTC( ) * 1E-9
-          WRITE (*,'(5X,A,F9.3,A)')  'Required cpu-time: ', &
-                                     cpu_end_time-cpu_start_time, ' sec'
-#endif
 
        ENDIF