Changeset 3987 for palm/trunk/SOURCE/init_3d_model.f90

Timestamp:

May 22, 2019 9:52:13 AM (5 years ago)

Author:

kanani

Message:

clean up location, debug and error messages

File:

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

palm/trunk/SOURCE/init_3d_model.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Convert most location messages to debug messages to reduce output in
+! job logfile to a minimum
+! 
+! 
 ! unused variable removed
 ! 
@@ -737 +741 @@
     INTEGER(iwp) ::  nz_s_shift_l !< topography-top index on scalar-grid, used to vertically shift initial profiles
 
-    CALL location_message( 'init_3d_model', 'start' )
-    CALL location_message( 'allocating arrays', 'start' )
+
+    CALL location_message( 'model initialization', 'start' )
+
+    IF ( debug_output )  CALL debug_message( 'allocating arrays', 'start' )
 !
 !-- Allocate arrays
@@ -1087 +1093 @@
     intermediate_timestep_count = 0  ! needed when simulated_time = 0.0
        
-    CALL location_message( 'allocating arrays', 'finished' )
+    IF ( debug_output )  CALL debug_message( 'allocating arrays', 'end' )
 
 !
@@ -1110 +1116 @@
 !--    Initialization with provided input data derived from larger-scale model
        IF ( INDEX( initializing_actions, 'inifor' ) /= 0 )  THEN
-          CALL location_message( 'initializing with INIFOR', 'start' )
+          IF ( debug_output )  CALL debug_message( 'initializing with INIFOR', 'start' )
 !
 !--       Read initial 1D profiles or 3D data from NetCDF file, depending 
@@ -1313 +1319 @@
           CALL init_surfaces
 
-          CALL location_message( 'initializing with INIFOR', 'finished' )
+          IF ( debug_output )  CALL debug_message( 'initializing with INIFOR', 'end' )
 !
 !--    Initialization via computed 1D-model profiles
        ELSEIF ( INDEX( initializing_actions, 'set_1d-model_profiles' ) /= 0 )  THEN
 
-          CALL location_message( 'initializing with 1D model profiles', 'start' )
+          IF ( debug_output )  CALL debug_message( 'initializing with 1D model profiles', 'start' )
 !
 !--       Use solutions of the 1D model as initial profiles,
@@ -1380 +1386 @@
           CALL init_surfaces
 
-          CALL location_message( 'initializing with 1D model profiles', 'finished' )
+          IF ( debug_output )  CALL debug_message( 'initializing with 1D model profiles', 'end' )
 
        ELSEIF ( INDEX(initializing_actions, 'set_constant_profiles') /= 0 )    &
        THEN
 
-          CALL location_message( 'initializing with constant profiles', 'start' )
+          IF ( debug_output )  CALL debug_message( 'initializing with constant profiles', 'start' )
 
 !
@@ -1448 +1454 @@
           CALL init_surfaces
           
-          CALL location_message( 'initializing with constant profiles', 'finished' )
+          IF ( debug_output )  CALL debug_message( 'initializing with constant profiles', 'end' )
 
        ELSEIF ( INDEX(initializing_actions, 'by_user') /= 0 )                  &
        THEN
 
-          CALL location_message( 'initializing by user', 'start' )
+          IF ( debug_output )  CALL debug_message( 'initializing by user', 'start' )
 !
 !--       Pre-initialize surface variables, i.e. setting start- and end-indices
@@ -1463 +1469 @@
           CALL user_init_3d_model
 
-          CALL location_message( 'initializing by user', 'finished' )
-
-       ENDIF
-
-       CALL location_message( 'initializing statistics, boundary conditions, etc.', 'start' )
+          IF ( debug_output )  CALL debug_message( 'initializing by user', 'end' )
+
+       ENDIF
+
+       IF ( debug_output )  CALL debug_message( 'initializing statistics, boundary conditions, etc.', 'start' )
 
 !
@@ -1601 +1607 @@
        ENDIF       
 
-       CALL location_message( 'initializing statistics, boundary conditions, etc.', 'finished' )
+       IF ( debug_output )  CALL debug_message( 'initializing statistics, boundary conditions, etc.', 'end' )
 
     ELSEIF ( TRIM( initializing_actions ) == 'read_restart_data'  .OR.         &
@@ -1607 +1613 @@
     THEN
 
-       CALL location_message( 'initializing in case of restart / cyclic_fill', 'start' )
+       IF ( debug_output )  CALL debug_message( 'initializing in case of restart / cyclic_fill', 'start' )
 !
 !--    Initialize surface elements and its attributes, e.g. heat- and 
@@ -1867 +1873 @@
        IF ( passive_scalar )  ts_m  = 0.0_wp
 
-       CALL location_message( 'initializing in case of restart / cyclic_fill', 'finished' )
+       IF ( debug_output )  CALL debug_message( 'initializing in case of restart / cyclic_fill', 'end' )
 
     ELSE
@@ -2228 +2234 @@
          TRIM( initializing_actions ) /= 'cyclic_fill' )  THEN
 
+       IF ( debug_output )  CALL debug_message( 'creating disturbances + applying pressure solver', 'start' )
 !
 !--    Needed for both disturb_field and pres
@@ -2235 +2242 @@
 !$ACC COPY(v(nzb:nzt+1,nysg:nyng,nxlg:nxrg))
 
-       CALL location_message( 'creating initial disturbances', 'start' )
        CALL disturb_field( 'u', tend, u )
        CALL disturb_field( 'v', tend, v )
-       CALL location_message( 'creating initial disturbances', 'finished' )
 
 !$ACC DATA &
@@ -2255 +2260 @@
 !$ACC COPYIN(bc_h(1)%k(1:bc_h(1)%ns))
 
-       CALL location_message( 'applying pressure solver', 'start' )
        n_sor = nsor_ini
        CALL pres
        n_sor = nsor
-       CALL location_message( 'applying pressure solver', 'finished' )
 
 !$ACC END DATA
 !$ACC END DATA
+
+       IF ( debug_output )  CALL debug_message( 'creating disturbances + applying pressure solver', 'end' )
 
     ENDIF
@@ -2466 +2471 @@
 
 
-    CALL location_message( 'init_3d_model', 'finished' )
+    CALL location_message( 'model initialization', 'finished' )
 
  END SUBROUTINE init_3d_model