Changeset 3719 for palm/trunk/SOURCE/ocean_mod.f90

Timestamp:

Feb 6, 2019 1:10:18 PM (5 years ago)

Author:

kanani

Message:

Correct and clean-up cpu_logs, some overlapping counts (chemistry_model_mod, disturb_heatflux, large_scale_forcing_nudging_mod, ocean_mod, palm, prognostic_equations, synthetic_turbulence_generator_mod, time_integration, time_integration_spinup, turbulence_closure_mod)

File:

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

palm/trunk/SOURCE/ocean_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Changed log_point to log_point_s, otherwise this overlaps with 
+! 'all progn.equations' cpu measurement.
+! 
+! 3684 2019-01-20 20:20:58Z knoop
 ! nopointer option removed
 ! 
@@ -1492 +1496 @@
 
     USE cpulog,                                                                &
-        ONLY:  cpu_log, log_point
+        ONLY:  cpu_log, log_point_s
 
     USE diffusion_s_mod,                                                       &
@@ -1529 +1533 @@
     IF ( salinity )  THEN
 
-       CALL cpu_log( log_point(37), 'sa-equation', 'start' )
+       CALL cpu_log( log_point_s(20), 'sa-equation', 'start' )
 
 !
@@ -1616 +1620 @@
        ENDIF
 
-       CALL cpu_log( log_point(37), 'sa-equation', 'stop' )
+       CALL cpu_log( log_point_s(20), 'sa-equation', 'stop' )
 
     ENDIF
@@ -1622 +1626 @@
 !
 !-- Calculate density by the equation of state for seawater
-    CALL cpu_log( log_point(38), 'eqns-seawater', 'start' )
+    CALL cpu_log( log_point_s(21), 'eqns-seawater', 'start' )
     CALL eqn_state_seawater
-    CALL cpu_log( log_point(38), 'eqns-seawater', 'stop' )
+    CALL cpu_log( log_point_s(21), 'eqns-seawater', 'stop' )
 
  END SUBROUTINE ocean_prognostic_equations