Changeset 3724 for palm

Timestamp:

Feb 6, 2019 4:28:23 PM (5 years ago)

Author:

kanani

Message:

Correct double-used log_point_s units (bulk_cloud_model_mod, time_integration, turbulence_closure_mod)

Location:

palm/trunk/SOURCE

Files:

• bulk_cloud_model_mod.f90 (modified) (5 diffs)
• time_integration.f90 (modified) (2 diffs)
• turbulence_closure_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/bulk_cloud_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Correct double-used log_point_s unit
+! 
+! 3700 2019-01-26 17:03:42Z knoop
 ! nopointer option removed
 ! 
@@ -2065 +2068 @@
        REAL(wp) ::  flag                  !< flag to indicate first grid level above
 
-       CALL cpu_log( log_point_s(54), 'adjust_cloud', 'start' )
+       CALL cpu_log( log_point_s(50), 'adjust_cloud', 'start' )
 
        DO  i = nxlg, nxrg
@@ -2100 +2103 @@
        ENDDO
 
-       CALL cpu_log( log_point_s(54), 'adjust_cloud', 'stop' )
+       CALL cpu_log( log_point_s(50), 'adjust_cloud', 'stop' )
 
     END SUBROUTINE adjust_cloud
@@ -2324 +2327 @@
        REAL(wp)     ::  xc                !<
 
-       CALL cpu_log( log_point_s(55), 'autoconversion', 'start' )
+       CALL cpu_log( log_point_s(47), 'autoconversion', 'start' )
 
        DO  i = nxlg, nxrg
@@ -2420 +2423 @@
        ENDDO
 
-       CALL cpu_log( log_point_s(55), 'autoconversion', 'stop' )
+       CALL cpu_log( log_point_s(47), 'autoconversion', 'stop' )
 
     END SUBROUTINE autoconversion

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Correct double-used log_point_s unit 
+! 
+! 3719 2019-02-06 13:10:18Z kanani
 ! - removed wind_turbine cpu measurement, since same time is measured inside
 !   wtm_forces subroutine as special measures
@@ -1351 +1354 @@
                 IF ( ( urban_surface  .OR.  land_surface )  .AND.               &
                      radiation_interactions )  THEN
-                   CALL cpu_log( log_point_s(75), 'radiation_interaction', 'start' )
+                   CALL cpu_log( log_point_s(46), 'radiation_interaction', 'start' )
                    CALL radiation_interaction
-                   CALL cpu_log( log_point_s(75), 'radiation_interaction', 'stop' )
+                   CALL cpu_log( log_point_s(46), 'radiation_interaction', 'stop' )
                 ENDIF
     

palm/trunk/SOURCE/turbulence_closure_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Correct double-used log_point_s units
+! 
+! 3719 2019-02-06 13:10:18Z kanani
 ! Changed log_point to log_point_s, otherwise this overlaps with 
 ! 'all progn.equations' cpu measurement.
@@ -1949 +1952 @@
     IF ( .NOT. constant_diffusion )  THEN
 
-       CALL cpu_log( log_point_s(16), 'tke-equation', 'start' )
+       CALL cpu_log( log_point_s(67), 'tke-equation', 'start' )
 
        sbt = tsc(2)
@@ -2057 +2060 @@
        ENDIF
 
-       CALL cpu_log( log_point_s(16), 'tke-equation', 'stop' )
+       CALL cpu_log( log_point_s(67), 'tke-equation', 'stop' )
 
     ENDIF   ! TKE equation
@@ -2065 +2068 @@
     IF ( rans_tke_e )  THEN
 
-       CALL cpu_log( log_point_s(33), 'diss-equation', 'start' )
+       CALL cpu_log( log_point_s(64), 'diss-equation', 'start' )
 
        sbt = tsc(2)
@@ -2157 +2160 @@
        ENDIF
 
-       CALL cpu_log( log_point_s(33), 'diss-equation', 'stop' )
+       CALL cpu_log( log_point_s(64), 'diss-equation', 'stop' )
 
     ENDIF