Changeset 2723 for palm/trunk/SOURCE/time_integration_spinup.f90

Timestamp:

Jan 5, 2018 9:27:03 AM (6 years ago)

Author:

maronga

Message:

bugfixes for spinup mechanism to work with lsm+usm+radiation

File:

• palm/trunk/SOURCE/time_integration_spinup.f90 (modified) (13 diffs)

palm/trunk/SOURCE/time_integration_spinup.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: array rad_sw_in no longer exists and is thus removed from RUN_CONTROL
+! output.
+! Added output of XY and 3D data during spinup.
+! Bugfix: time step in LSM and USM was set to dt_3d instead of dt_spinup
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -62 +68 @@
                coupling_start_time, current_timestep_number,                   &
                data_output_during_spinup, disturbance_created, dopr_n, do_sum, &
-               dt_averaging_input_pr, dt_dopr, dt_dots, dt_run_control,        &
-               dt_spinup, humidity, intermediate_timestep_count,               &
+               dt_averaging_input_pr, dt_dopr, dt_dots, dt_do2d_xy, dt_do3d, dt_run_control,        &
+               dt_spinup, dt_3d, humidity, intermediate_timestep_count,               &
                intermediate_timestep_count_max, land_surface,                  &
-               simulated_time, simulated_time_chr,      &
-               skip_time_dopr, spinup, spinup_pt_amplitude, spinup_pt_mean,    &
-               spinup_time, timestep_count, timestep_scheme, time_dopr,        &
-               time_dopr_av, time_dots, time_run_control,                      &
+               simulated_time, simulated_time_chr,                             &
+               skip_time_dopr, skip_time_do2d_xy, skip_time_do3d, spinup, spinup_pt_amplitude, &
+               spinup_pt_mean, spinup_time, timestep_count, timestep_scheme,   &
+               time_dopr, time_dopr_av, time_dots, time_do2d_xy, time_do3d, time_run_control,           &
                time_since_reference_point, urban_surface
 
@@ -130 +136 @@
 
     REAL(wp) ::  pt_spinup   !< temporary storage of temperature
+    REAL(wp) ::  dt_save     !< temporary storage for time step
                   
     REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  pt_save   !< temporary storage of temperature
@@ -137 +144 @@
     CALL exchange_horiz( pt, nbgp )   
     pt_save = pt
+
+    dt_save = dt_3d
+    dt_3d   = dt_spinup
 
     CALL location_message( 'starting spinup-sequence', .TRUE. )
@@ -299 +309 @@
                == intermediate_timestep_count_max )  THEN
 
-               time_radiation = time_radiation + dt_spinup
+               time_radiation = time_radiation + dt_3d
 
              IF ( time_radiation >= dt_radiation .OR. force_radiation_call )   &
@@ -327 +337 @@
 !--    Increase simulation time and output times
        current_timestep_number_spinup = current_timestep_number_spinup + 1
-       simulated_time             = simulated_time   + dt_spinup
+       simulated_time             = simulated_time   + dt_3d
        simulated_time_chr         = time_to_string( simulated_time )
        time_since_reference_point = simulated_time - coupling_start_time
 
        IF ( data_output_during_spinup )  THEN
-          time_dots          = time_dots        + dt_spinup
+          IF ( simulated_time >= skip_time_do2d_xy )  THEN
+             time_do2d_xy       = time_do2d_xy     + dt_3d
+          ENDIF
+          IF ( simulated_time >= skip_time_do3d    )  THEN
+             time_do3d          = time_do3d        + dt_3d
+          ENDIF
+          time_dots          = time_dots        + dt_3d
           IF ( simulated_time >= skip_time_dopr )  THEN
-             time_dopr       = time_dopr        + dt_spinup
-          ENDIF
-          time_run_control   = time_run_control + dt_spinup
+             time_dopr       = time_dopr        + dt_3d
+          ENDIF
+          time_run_control   = time_run_control + dt_3d
 
 !
@@ -354 +370 @@
              ( dt_dopr - time_dopr ) <= averaging_interval_pr  .AND.           &
              simulated_time >= skip_time_dopr )  THEN
-             time_dopr_av = time_dopr_av + dt_spinup
+             time_dopr_av = time_dopr_av + dt_3d
              IF ( time_dopr_av >= dt_averaging_input_pr )  THEN
                 do_sum = .TRUE.
                 time_dopr_av = MOD( time_dopr_av,                              &
-                               MAX( dt_averaging_input_pr, dt_spinup ) )
+                               MAX( dt_averaging_input_pr, dt_3d ) )
              ENDIF
           ENDIF
@@ -367 +383 @@
           IF ( time_dopr >= dt_dopr )  THEN
              IF ( dopr_n /= 0 )  CALL data_output_profiles
-             time_dopr = MOD( time_dopr, MAX( dt_dopr, dt_spinup ) )
+             time_dopr = MOD( time_dopr, MAX( dt_dopr, dt_3d ) )
              time_dopr_av = 0.0_wp    ! due to averaging (see above)
           ENDIF
@@ -375 +391 @@
           IF ( time_dots >= dt_dots )  THEN
              CALL data_output_tseries
-             time_dots = MOD( time_dots, MAX( dt_dots, dt_spinup ) )
-          ENDIF
+             time_dots = MOD( time_dots, MAX( dt_dots, dt_3d ) )
+          ENDIF
+
+!
+!--       2d-data output (cross-sections)
+          IF ( time_do2d_xy >= dt_do2d_xy )  THEN
+             CALL data_output_2d( 'xy', 0 )
+             time_do2d_xy = MOD( time_do2d_xy, MAX( dt_do2d_xy, dt_3d ) )
+          ENDIF
+
+!
+!--       3d-data output (volume data)
+          IF ( time_do3d >= dt_do3d )  THEN
+             CALL data_output_3d( 0 )
+             time_do3d = MOD( time_do3d, MAX( dt_do3d, dt_3d ) )
+          ENDIF
+
 
        ENDIF
@@ -389 +420 @@
 !           IF ( time_run_control >= dt_run_control )  THEN
 !              time_run_control = MOD( time_run_control,                         &
-!                                      MAX( dt_run_control, dt_spinup ) )
+!                                      MAX( dt_run_control, dt_3d ) )
 !           ENDIF
 !        ENDIF
@@ -408 +439 @@
 !
 !--       Write some general information about the spinup in run control file
-          WRITE ( 15, 101 )  current_timestep_number_spinup, simulated_time_chr, dt_spinup, pt_spinup, rad_sw_in(0,nysg,nxlg)
+          WRITE ( 15, 101 )  current_timestep_number_spinup, simulated_time_chr, dt_3d, pt_spinup
 !
 !--       Write buffer contents to disc immediately
@@ -423 +454 @@
     pt_p(:,:,:) = pt_save
 
+!
+!-- Reset time step
+    dt_3d = dt_save
+
     DEALLOCATE(pt_save)
 
@@ -431 +466 @@
 !-- Formats
 100 FORMAT (///'Spinup control output:'/  &
-            '----------------------------------------'// &
-            'ITER.  HH:MM:SS    DT   PT(z_MO)     SWD'/   &
-            '----------------------------------------')
+            '--------------------------------'// &
+            'ITER.  HH:MM:SS    DT   PT(z_MO)'/   &
+            '--------------------------------')
 101 FORMAT (I5,2X,A9,1X,F6.2,3X,F6.2,2X,F6.2)