Changeset 4795 for palm/trunk/SOURCE/salsa_mod.f90

Timestamp:

Nov 25, 2020 3:55:14 PM (4 years ago)

Author:

suehring

Message:

mesoscale nesting: bugfix in obtaining the correct timestamp in case of restart runs; virtual measurements: add missing control flags

File:

• palm/trunk/SOURCE/salsa_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Bugfix in obtaining the correct timestamp in case of restart runs
+!
+! 4785 2020-11-15 20:11:14Z monakurppa
 ! Fixing a segmentation fault in initialising aerosol and gas emissions
 !
@@ -328 +331 @@
         ONLY:  air_chemistry, bc_dirichlet_l, bc_dirichlet_n, bc_dirichlet_r, bc_dirichlet_s,      &
                bc_lr, bc_lr_cyc, bc_ns, bc_ns_cyc, bc_radiation_l, bc_radiation_n, bc_radiation_r, &
-               bc_radiation_s, coupling_char, debug_output, dt_3d, intermediate_timestep_count,    &
+               bc_radiation_s, coupling_char, debug_output, dt_3d,                                 &
+               initializing_actions,                                                               &
+               intermediate_timestep_count,                                                        &
                intermediate_timestep_count_max, land_surface, max_pr_salsa, message_string,        &
                monotonic_limiter_z, plant_canopy, pt_surface, restart_data_format_output, salsa,   &
@@ -779 +784 @@
        INTEGER(iwp) ::  nt          !< number of time levels in dynamic input file
        INTEGER(iwp) ::  nzu         !< number of vertical levels on scalar grid in dynamic input file
-       INTEGER(iwp) ::  tind        !< time index for reference time in mesoscale-offline nesting
-       INTEGER(iwp) ::  tind_p      !< time index for following time in mesoscale-offline nesting
+       INTEGER(iwp) ::  tind = 0    !< time index for reference time in mesoscale-offline nesting
+       INTEGER(iwp) ::  tind_p = 0  !< time index for following time in mesoscale-offline nesting
 
        INTEGER(iwp), DIMENSION(maxspec) ::  cc_in2mod = 0  !< to transfer chemical composition from input to model
@@ -13759 +13764 @@
 !-- Obtain time index for current point in time.
     salsa_nest_offl%tind = MINLOC( ABS( salsa_nest_offl%time -                                     &
-                                   MAX( time_since_reference_point, 0.0_wp ) ), DIM = 1 ) - 1
+                                        MAX( time_since_reference_point, 0.0_wp ) ), DIM = 1 ) - 1
+!
+!-- Note, in case of restart runs, the time index for the boundary data may indicate a time
+!-- in the future. This needs to be checked and corrected.
+    IF ( TRIM( initializing_actions ) == 'read_restart_data'  .AND.                                &
+         salsa_nest_offl%time(salsa_nest_offl%tind) > time_since_reference_point )  THEN
+       salsa_nest_offl%tind = salsa_nest_offl%tind - 1
+    ENDIF
     salsa_nest_offl%tind_p = salsa_nest_offl%tind + 1
 !