Changeset 2980 for palm

Timestamp:

Apr 17, 2018 3:19:27 PM (7 years ago)

Author:

suehring

Message:

Improvement for spinup checks concering consistency in nesting mode

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (5 diffs)
• parin.f90 (modified) (2 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Further improvement for spinup checks.
+! 
+! 2974 2018-04-16 12:59:52Z gronemeier
 ! Bugfix: check if dt_data_output_av is zero in case of parallel NetCDF output
 ! 
@@ -719 +722 @@
     INTEGER(iwp) ::  lsp                             !< running index for chem spcs.
 
-    LOGICAL     ::  check_nest                       !< flag used to check initialization in case of nesting
     LOGICAL     ::  found                            !<
 
@@ -1044 +1046 @@
 !-- Check turbulence closure setup
     CALL tcm_check_parameters
-
 !
 !-- Check approximation
@@ -1399 +1400 @@
 !-- In case of spinup and nested run, spinup end time must be identical 
 !-- in order to have synchronously running simulations. 
-    IF ( nested_run  .AND.  spinup )  THEN
+    IF ( nested_run )  THEN
 #if defined( __parallel )
        CALL MPI_ALLREDUCE( spinup_time, spinup_time_max, 1, MPI_REAL,          &
@@ -1405 +1406 @@
        CALL MPI_ALLREDUCE( dt_spinup,   dt_spinup_max,   1, MPI_REAL,          &
                            MPI_MAX, MPI_COMM_WORLD, ierr )
-
        IF ( spinup_time /= spinup_time_max  .OR.  dt_spinup /= dt_spinup_max ) &
        THEN

palm/trunk/SOURCE/parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Revise message call
+! 
+! 2975 2018-04-16 15:22:20Z suehring
 ! - Informative message when initializing_actions has been changed 
 !   to set_constant_profile in child domain 
@@ -928 +931 @@
 !--       if user decides to do everything by its own.
           IF ( nest_domain  .AND.  .NOT. (                                     &
-               TRIM( initializing_actions ) == 'read_restart_data'  .OR.       &
+               TRIM( initializing_actions ) == 'read_restart_data'      .OR.   &
+               TRIM( initializing_actions ) == 'set_constant_profiles'  .OR.   &
                TRIM( initializing_actions ) == 'by_user' ) )  THEN
              message_string = 'initializing_actions = ' //                     &