Ignore:
Timestamp:
Jun 28, 2017 2:35:57 PM (4 years ago)
Author:
scharf
Message:

bugfixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/time_integration_spinup.f90

    r2296 r2297  
    2525! -----------------
    2626! $Id$
     27! bugfixes
     28!
     29! 2296 2017-06-28 07:53:56Z maronga
    2730! Initial revision
    2831!
     
    4144
    4245    USE control_parameters,                                                    &
    43         ONLY:  averaging_interval_pr, constant_diffusion, constant_flux_layer, 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, intermediate_timestep_count_max, land_surface, nr_timesteps_this_run, 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, time_since_reference_point, urban_surface
     46        ONLY:  averaging_interval_pr, constant_diffusion, constant_flux_layer, &
     47               coupling_start_time, current_timestep_number,                   &
     48               data_output_during_spinup, disturbance_created, dopr_n, do_sum, &
     49               dt_averaging_input_pr, dt_dopr, dt_dots, dt_run_control,        &
     50               dt_spinup, humidity, intermediate_timestep_count,               &
     51               intermediate_timestep_count_max, land_surface,                  &
     52               nr_timesteps_this_run, simulated_time, simulated_time_chr,      &
     53               skip_time_dopr, spinup, spinup_pt_amplitude, spinup_pt_mean,    &
     54               spinup_time, timestep_count, timestep_scheme, time_dopr,        &
     55               time_dopr_av, time_dots, time_run_control,                      &
     56               time_since_reference_point, urban_surface
    4457
    4558    USE constants,                                                             &
     
    7184        ONLY:  surface_layer_fluxes
    7285
    73     USE surface_mod,                                                        &
    74         ONLY :  surf_def_h, surf_def_v, surf_lsm_h, surf_lsm_v, surf_usm_h, &
     86    USE surface_mod,                                                           &
     87        ONLY :  surf_def_h, surf_def_v, surf_lsm_h, surf_lsm_v, surf_usm_h,    &
    7588                surf_usm_v
    7689
     
    249262!--       If required, calculate radiative fluxes and heating rates
    250263          IF ( radiation .AND. intermediate_timestep_count                     &
    251                == intermediate_timestep_count_max .AND. simulated_time >    &
     264               == intermediate_timestep_count_max .AND. simulated_time >       &
    252265               skip_time_do_radiation )  THEN
    253266
     
    337350!--    Computation and output of run control parameters.
    338351!--    This is also done whenever perturbations have been imposed
    339        IF ( time_run_control >= dt_run_control  .OR.                     &
    340             timestep_scheme(1:5) /= 'runge'  .OR.  disturbance_created ) &
     352       IF ( time_run_control >= dt_run_control  .OR.                           &
     353            timestep_scheme(1:5) /= 'runge'  .OR.  disturbance_created )       &
    341354       THEN
    342355          CALL run_control
    343356          IF ( time_run_control >= dt_run_control )  THEN
    344              time_run_control = MOD( time_run_control, &
     357             time_run_control = MOD( time_run_control,                         &
    345358                                     MAX( dt_run_control, dt_spinup ) )
    346359          ENDIF
Note: See TracChangeset for help on using the changeset viewer.