Changeset 2776 for palm


Ignore:
Timestamp:
Jan 31, 2018 10:44:42 AM (4 years ago)
Author:
Giersch
Message:

Skipping of module related restart data changed + adapting synthetic turbulence generator to current restart procedure

Location:
palm/trunk/SOURCE
Files:
11 edited

Legend:

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

    r2773 r2776  
    2525! -----------------
    2626! $Id$
     27! Variable synthetic_turbulence_generator has been abbreviated
     28!
     29! 2773 2018-01-30 14:12:54Z suehring
    2730! Check for consistent initialization in nesting mode added.
    2831!
     
    13811384!
    13821385!-- When synthetic turbulence generator is used, peform addtional checks
    1383     IF ( synthetic_turbulence_generator )  CALL stg_check_parameters
     1386    IF ( syn_turb_gen )  CALL stg_check_parameters
    13841387!
    13851388!-- When plant canopy model is used, peform addtional checks
  • palm/trunk/SOURCE/header.f90

    r2746 r2776  
    2525! -----------------
    2626! $Id$
     27! Variable synthetic_turbulence_generator has been abbreviated
     28!
     29! 2746 2018-01-15 12:06:04Z suehring
    2730! Move flag plant canopy to modules
    2831!
     
    10131016    ENDIF
    10141017
    1015     IF ( synthetic_turbulence_generator )  CALL stg_header ( io )
     1018    IF ( syn_turb_gen )  CALL stg_header ( io )
    10161019
    10171020    IF ( plant_canopy )  CALL pcm_header ( io )
  • palm/trunk/SOURCE/init_3d_model.f90

    r2766 r2776  
    2525! -----------------
    2626! $Id$
     27! Variable use_synthetic_turbulence_generator has been abbreviated
     28!
     29! 2766 2018-01-22 17:17:47Z kanani
    2730! Removed preprocessor directive __chem
    2831!
     
    484487
    485488    USE synthetic_turbulence_generator_mod,                                    &
    486         ONLY:  stg_init, use_synthetic_turbulence_generator
     489        ONLY:  stg_init, use_syn_turb_gen
    487490
    488491    USE surface_layer_fluxes_mod,                                              &
     
    12911294!
    12921295!--       Overwrite initial profiles in case of synthetic turbulence generator
    1293           IF( use_synthetic_turbulence_generator ) THEN
     1296          IF( use_syn_turb_gen ) THEN
    12941297             CALL stg_init
    12951298          ENDIF
     
    18551858!--    Initialize synthetic turbulence generator in case of restart.
    18561859       IF ( TRIM( initializing_actions ) == 'read_restart_data'  .AND.         &
    1857             use_synthetic_turbulence_generator )  CALL stg_init
     1860            use_syn_turb_gen )  CALL stg_init
    18581861
    18591862       CALL location_message( 'finished', .TRUE. )
  • palm/trunk/SOURCE/init_pegrid.f90

    r2718 r2776  
    2525! -----------------
    2626! $Id$
     27! Variable use_synthetic_turbulence_generator has been abbreviated
     28!
     29! 2718 2018-01-02 08:49:38Z maronga
    2730! Corrected "Former revisions" section
    2831!
     
    248251
    249252    USE synthetic_turbulence_generator_mod,                                    &
    250         ONLY:  use_synthetic_turbulence_generator
     253        ONLY:  use_syn_turb_gen
    251254
    252255    USE transpose_indices,                                                     &
     
    516519!-- This transposition is not neccessary in case of a 1d-decomposition along x
    517520    IF ( psolver == 'poisfft'  .OR.  calculate_spectra  .OR.                   &
    518          use_synthetic_turbulence_generator )  THEN
     521         use_syn_turb_gen )  THEN
    519522
    520523       IF ( pdims(2) /= 1 )  THEN
  • palm/trunk/SOURCE/modules.f90

    r2765 r2776  
    2525! -----------------
    2626! $Id$
     27! Variable synthetic_turbulence_generator has been abbreviated and _prerun flags
     28! for skipping module related restart data has beed introduced
     29!
     30! 2765 2018-01-22 11:34:58Z maronga
    2731! Set initial value for time_since_reference_point
    2832!
     
    11961200    INTEGER(iwp), DIMENSION(:,:), ALLOCATABLE ::  mask_k_global  !< global grid index of masked output point on z-dimension
    11971201
    1198     LOGICAL ::  aerosol_nacl =.TRUE.                         !< nacl aerosol for bulk scheme
    1199     LOGICAL ::  aerosol_c3h4o4 =.FALSE.                      !< malonic acid aerosol for bulk scheme
    1200     LOGICAL ::  aerosol_nh4no3 =.FALSE.                      !< malonic acid aerosol for bulk scheme
    1201     LOGICAL ::  air_chemistry = .FALSE.                      !< chemistry model switch
    1202     LOGICAL ::  bc_lr_cyc =.TRUE.                            !< left-right boundary condition cyclic?
    1203     LOGICAL ::  bc_lr_dirrad = .FALSE.                       !< left-right boundary condition dirichlet/radiation?
    1204     LOGICAL ::  bc_lr_raddir = .FALSE.                       !< left-right boundary condition radiation/dirichlet?
    1205     LOGICAL ::  bc_ns_cyc = .TRUE.                           !< north-south boundary condition cyclic?
    1206     LOGICAL ::  bc_ns_dirrad = .FALSE.                       !< north-south boundary condition dirichlet/radiation?
    1207     LOGICAL ::  bc_ns_raddir = .FALSE.                       !< north-south boundary condition radiation/dirichlet?
    1208     LOGICAL ::  call_microphysics_at_all_substeps = .FALSE.  !< namelist parameter
    1209     LOGICAL ::  call_psolver_at_all_substeps = .TRUE.        !< namelist parameter
    1210     LOGICAL ::  cloud_droplets = .FALSE.                     !< namelist parameter
    1211     LOGICAL ::  cloud_physics = .FALSE.                      !< namelist parameter
    1212     LOGICAL ::  cloud_top_radiation = .FALSE.                !< namelist parameter
    1213     LOGICAL ::  complex_terrain = .FALSE.                    !< namelist parameter
    1214     LOGICAL ::  conserve_volume_flow = .FALSE.               !< namelist parameter
    1215     LOGICAL ::  constant_diffusion = .FALSE.                 !< diffusion coefficient constant?
    1216     LOGICAL ::  constant_flux_layer = .TRUE.                 !< namelist parameter
    1217     LOGICAL ::  constant_heatflux = .TRUE.                   !< heat flux at all surfaces constant?
    1218     LOGICAL ::  constant_top_heatflux = .TRUE.               !< heat flux at domain top constant?
    1219     LOGICAL ::  constant_top_momentumflux = .FALSE.          !< momentum flux at domain topconstant?
    1220     LOGICAL ::  constant_top_salinityflux = .TRUE.           !< salinity flux at ocean domain top?
    1221     LOGICAL ::  constant_top_scalarflux = .TRUE.             !< passive-scalar flux at domain top constant?
    1222     LOGICAL ::  constant_scalarflux = .TRUE.                 !< passive-scalar flux at surfaces constant?
    1223     LOGICAL ::  constant_waterflux = .TRUE.                  !< water flux at all surfaces constant?
    1224     LOGICAL ::  create_disturbances = .TRUE.                 !< namelist parameter
    1225     LOGICAL ::  data_output_during_spinup = .FALSE.          !< namelist parameter
    1226     LOGICAL ::  data_output_2d_on_each_pe = .TRUE.           !< namelist parameter
    1227     LOGICAL ::  disturbance_created = .FALSE.                !< flow disturbance imposed?
    1228     LOGICAL ::  do2d_at_begin = .FALSE.                      !< namelist parameter
    1229     LOGICAL ::  do3d_at_begin = .FALSE.                      !< namelist parameter
    1230     LOGICAL ::  do_sum = .FALSE.                             !< contribute to time average of profile data?
    1231     LOGICAL ::  dp_external = .FALSE.                        !< namelist parameter
    1232     LOGICAL ::  dp_smooth = .FALSE.                          !< namelist parameter
    1233     LOGICAL ::  dt_fixed = .FALSE.                           !< fixed timestep (namelist parameter dt set)?
    1234     LOGICAL ::  dt_3d_reached                                !< internal timestep for particle advection
    1235     LOGICAL ::  dt_3d_reached_l                              !< internal timestep for particle advection
    1236     LOGICAL ::  first_call_lpm = .TRUE.                      !< call lpm only once per timestep?
    1237     LOGICAL ::  force_print_header = .FALSE.                 !< namelist parameter
    1238     LOGICAL ::  force_bound_l = .FALSE.                      !< flag indicating domain boundary on left side to set forcing boundary conditions
    1239     LOGICAL ::  force_bound_n = .FALSE.                      !< flag indicating domain boundary on north side to set forcing boundary conditions
    1240     LOGICAL ::  force_bound_r = .FALSE.                      !< flag indicating domain boundary on right side to set forcing boundary conditions
    1241     LOGICAL ::  force_bound_s = .FALSE.                      !< flag indicating domain boundary on south side to set forcing boundary conditions
    1242     LOGICAL ::  forcing = .FALSE.                            !< flag controlling forcing from large-scale model     
    1243     LOGICAL ::  galilei_transformation = .FALSE.             !< namelist parameter
    1244     LOGICAL ::  humidity = .FALSE.                           !< namelist parameter
    1245     LOGICAL ::  humidity_remote = .FALSE.                    !< switch for receiving near-surface humidity flux (atmosphere-ocean coupling)
    1246     LOGICAL ::  inflow_l = .FALSE.                           !< left domain boundary has non-cyclic inflow?
    1247     LOGICAL ::  inflow_n = .FALSE.                           !< north domain boundary has non-cyclic inflow?
    1248     LOGICAL ::  inflow_r = .FALSE.                           !< right domain boundary has non-cyclic inflow?
    1249     LOGICAL ::  inflow_s = .FALSE.                           !< south domain boundary has non-cyclic inflow?
    1250     LOGICAL ::  large_scale_forcing = .FALSE.                !< namelist parameter
    1251     LOGICAL ::  large_scale_subsidence = .FALSE.             !< namelist parameter
    1252     LOGICAL ::  land_surface = .FALSE.                       !< use land surface model?
    1253     LOGICAL ::  les_mw = .FALSE.                             !< use Moeng-Wyngaard turbulence closure for LES mode
    1254     LOGICAL ::  lsf_exception = .FALSE.                      !< use of lsf with buildings (temporary)?
    1255     LOGICAL ::  lsf_surf = .TRUE.                            !< use surface forcing (large scale forcing)?
    1256     LOGICAL ::  lsf_vert = .TRUE.                            !< use atmospheric forcing (large scale forcing)?
    1257     LOGICAL ::  masking_method = .FALSE.                     !< namelist parameter
    1258     LOGICAL ::  microphysics_sat_adjust = .FALSE.            !< use saturation adjust bulk scheme?
    1259     LOGICAL ::  microphysics_kessler = .FALSE.               !< use kessler bulk scheme?
    1260     LOGICAL ::  microphysics_morrison = .FALSE.              !< use 2-moment Morrison (add. prog. eq. for nc and qc)
    1261     LOGICAL ::  microphysics_seifert = .FALSE.               !< use 2-moment Seifert and Beheng scheme
    1262     LOGICAL ::  mg_switch_to_pe0 = .FALSE.                   !< internal multigrid switch for steering the ghost point exchange in case that data has been collected on PE0
    1263     LOGICAL ::  nest_bound_l = .FALSE.                       !< flag indicating nested domain boundary on left side
    1264     LOGICAL ::  nest_bound_n = .FALSE.                       !< flag indicating nested domain boundary on north side
    1265     LOGICAL ::  nest_bound_r = .FALSE.                       !< flag indicating nested domain boundary on right side
    1266     LOGICAL ::  nest_bound_s = .FALSE.                       !< flag indicating nested domain boundary on south side
    1267     LOGICAL ::  nest_domain  = .FALSE.                       !< domain is nested into a parent domain?
    1268     LOGICAL ::  neutral = .FALSE.                            !< namelist parameter
    1269     LOGICAL ::  nudging = .FALSE.                            !< namelist parameter
    1270     LOGICAL ::  ocean = .FALSE.                              !< namelist parameter
    1271     LOGICAL ::  outflow_l = .FALSE.                          !< left domain boundary has non-cyclic outflow?
    1272     LOGICAL ::  outflow_n = .FALSE.                          !< north domain boundary has non-cyclic outflow?
    1273     LOGICAL ::  outflow_r = .FALSE.                          !< right domain boundary has non-cyclic outflow?
    1274     LOGICAL ::  outflow_s = .FALSE.                          !< south domain boundary has non-cyclic outflow?
    1275     LOGICAL ::  passive_scalar = .FALSE.                     !< namelist parameter
    1276     LOGICAL ::  plant_canopy = .FALSE.                       !< switch for use of plant canopy model
    1277     LOGICAL ::  precipitation = .FALSE.                      !< namelist parameter
    1278     LOGICAL ::  random_heatflux = .FALSE.                    !< namelist parameter
    1279     LOGICAL ::  rans_mode = .FALSE.                          !< switch between RANS and LES mode
    1280     LOGICAL ::  rans_tke_e = .FALSE.                         !< use TKE-e turbulence closure for RANS mode
    1281     LOGICAL ::  rans_tke_l = .FALSE.                         !< use TKE-l turbulence closure for RANS mode
    1282     LOGICAL ::  recycling_yshift = .FALSE.                   !< namelist parameter
    1283     LOGICAL ::  run_control_header = .FALSE.                 !< onetime output of RUN_CONTROL header
    1284     LOGICAL ::  run_coupled = .TRUE.                         !< internal switch telling PALM to run in coupled mode (i.e. to exchange surface data) in case of atmosphere-ocean coupling
    1285     LOGICAL ::  scalar_rayleigh_damping = .TRUE.             !< namelist parameter
    1286     LOGICAL ::  sloping_surface = .FALSE.                    !< use sloped surface? (namelist parameter alpha_surface)
    1287     LOGICAL ::  spinup = .FALSE.                             !< perform model spinup without atmosphere code?
    1288     LOGICAL ::  stop_dt = .FALSE.                            !< internal switch to stop the time stepping
    1289     LOGICAL ::  synchronous_exchange = .FALSE.               !< namelist parameter
    1290     LOGICAL ::  synthetic_turbulence_generator = .FALSE.     !< flag for synthetic turbulence generator module
    1291     LOGICAL ::  terminate_run = .FALSE.                      !< terminate run (cpu-time limit, restarts)?
    1292     LOGICAL ::  topo_no_distinct = .FALSE.                   !< flag controlling classification of topography surfaces
    1293     LOGICAL ::  transpose_compute_overlap = .FALSE.          !< namelist parameter
    1294     LOGICAL ::  turbulent_inflow = .FALSE.                   !< namelist parameter
    1295     LOGICAL ::  turbulent_outflow = .FALSE.                  !< namelist parameter
    1296     LOGICAL ::  urban_surface = .FALSE.                      !< use urban surface model?
    1297     LOGICAL ::  use_cmax = .TRUE.                            !< namelist parameter
    1298     LOGICAL ::  use_initial_profile_as_reference = .FALSE.   !< use of initial profiles as reference state?
    1299     LOGICAL ::  use_prescribed_profile_data = .FALSE.        !< use of prescribed wind profiles?
    1300                                                              !< (namelist parameters u_profile, v_profile)
    1301     LOGICAL ::  use_single_reference_value = .FALSE.         !< use of single value as reference state?
    1302     LOGICAL ::  use_subsidence_tendencies = .FALSE.          !< namelist parameter
    1303     LOGICAL ::  use_surface_fluxes = .FALSE.                 !< namelist parameter
    1304     LOGICAL ::  use_top_fluxes = .FALSE.                     !< namelist parameter
    1305     LOGICAL ::  use_ug_for_galilei_tr = .TRUE.               !< namelist parameter
    1306     LOGICAL ::  use_upstream_for_tke = .FALSE.               !< namelist parameter
    1307     LOGICAL ::  uv_exposure = .FALSE.                        !< switch for uv exposure model
    1308     LOGICAL ::  virtual_flight = .FALSE.                     !< use virtual flight model?
    1309     LOGICAL ::  wall_adjustment = .TRUE.                     !< namelist parameter
    1310     LOGICAL ::  wind_turbine = .FALSE.                       !< flag for use of wind turbine model
    1311     LOGICAL ::  write_binary = .FALSE.                       !< ENVPAR namelist parameter to steer restart I/O (ENVPAR is created by mrun)
    1312     LOGICAL ::  ws_scheme_sca = .FALSE.                      !< use Wicker-Skamarock scheme (scalar advection)?
    1313     LOGICAL ::  ws_scheme_mom = .FALSE.                      !< use Wicker-Skamarock scheme (momentum advection)?
     1202    LOGICAL ::  aerosol_nacl =.TRUE.                             !< nacl aerosol for bulk scheme
     1203    LOGICAL ::  aerosol_c3h4o4 =.FALSE.                          !< malonic acid aerosol for bulk scheme
     1204    LOGICAL ::  aerosol_nh4no3 =.FALSE.                          !< malonic acid aerosol for bulk scheme
     1205    LOGICAL ::  air_chemistry = .FALSE.                          !< chemistry model switch
     1206    LOGICAL ::  bc_lr_cyc =.TRUE.                                !< left-right boundary condition cyclic?
     1207    LOGICAL ::  bc_lr_dirrad = .FALSE.                           !< left-right boundary condition dirichlet/radiation?
     1208    LOGICAL ::  bc_lr_raddir = .FALSE.                           !< left-right boundary condition radiation/dirichlet?
     1209    LOGICAL ::  bc_ns_cyc = .TRUE.                               !< north-south boundary condition cyclic?
     1210    LOGICAL ::  bc_ns_dirrad = .FALSE.                           !< north-south boundary condition dirichlet/radiation?
     1211    LOGICAL ::  bc_ns_raddir = .FALSE.                           !< north-south boundary condition radiation/dirichlet?
     1212    LOGICAL ::  call_microphysics_at_all_substeps = .FALSE.      !< namelist parameter
     1213    LOGICAL ::  call_psolver_at_all_substeps = .TRUE.            !< namelist parameter
     1214    LOGICAL ::  cloud_droplets = .FALSE.                         !< namelist parameter
     1215    LOGICAL ::  cloud_physics = .FALSE.                          !< namelist parameter
     1216    LOGICAL ::  cloud_top_radiation = .FALSE.                    !< namelist parameter
     1217    LOGICAL ::  complex_terrain = .FALSE.                        !< namelist parameter
     1218    LOGICAL ::  conserve_volume_flow = .FALSE.                   !< namelist parameter
     1219    LOGICAL ::  constant_diffusion = .FALSE.                     !< diffusion coefficient constant?
     1220    LOGICAL ::  constant_flux_layer = .TRUE.                     !< namelist parameter
     1221    LOGICAL ::  constant_heatflux = .TRUE.                       !< heat flux at all surfaces constant?
     1222    LOGICAL ::  constant_top_heatflux = .TRUE.                   !< heat flux at domain top constant?
     1223    LOGICAL ::  constant_top_momentumflux = .FALSE.              !< momentum flux at domain topconstant?
     1224    LOGICAL ::  constant_top_salinityflux = .TRUE.               !< salinity flux at ocean domain top?
     1225    LOGICAL ::  constant_top_scalarflux = .TRUE.                 !< passive-scalar flux at domain top constant?
     1226    LOGICAL ::  constant_scalarflux = .TRUE.                     !< passive-scalar flux at surfaces constant?
     1227    LOGICAL ::  constant_waterflux = .TRUE.                      !< water flux at all surfaces constant?
     1228    LOGICAL ::  create_disturbances = .TRUE.                     !< namelist parameter
     1229    LOGICAL ::  data_output_during_spinup = .FALSE.              !< namelist parameter
     1230    LOGICAL ::  data_output_2d_on_each_pe = .TRUE.               !< namelist parameter
     1231    LOGICAL ::  disturbance_created = .FALSE.                    !< flow disturbance imposed?
     1232    LOGICAL ::  do2d_at_begin = .FALSE.                          !< namelist parameter
     1233    LOGICAL ::  do3d_at_begin = .FALSE.                          !< namelist parameter
     1234    LOGICAL ::  do_sum = .FALSE.                                 !< contribute to time average of profile data?
     1235    LOGICAL ::  dp_external = .FALSE.                            !< namelist parameter
     1236    LOGICAL ::  dp_smooth = .FALSE.                              !< namelist parameter
     1237    LOGICAL ::  dt_fixed = .FALSE.                               !< fixed timestep (namelist parameter dt set)?
     1238    LOGICAL ::  dt_3d_reached                                    !< internal timestep for particle advection
     1239    LOGICAL ::  dt_3d_reached_l                                  !< internal timestep for particle advection
     1240    LOGICAL ::  first_call_lpm = .TRUE.                          !< call lpm only once per timestep?
     1241    LOGICAL ::  force_print_header = .FALSE.                     !< namelist parameter
     1242    LOGICAL ::  force_bound_l = .FALSE.                          !< flag indicating domain boundary on left side to set forcing boundary conditions
     1243    LOGICAL ::  force_bound_n = .FALSE.                          !< flag indicating domain boundary on north side to set forcing boundary conditions
     1244    LOGICAL ::  force_bound_r = .FALSE.                          !< flag indicating domain boundary on right side to set forcing boundary conditions
     1245    LOGICAL ::  force_bound_s = .FALSE.                          !< flag indicating domain boundary on south side to set forcing boundary conditions
     1246    LOGICAL ::  forcing = .FALSE.                                !< flag controlling forcing from large-scale model     
     1247    LOGICAL ::  galilei_transformation = .FALSE.                 !< namelist parameter
     1248    LOGICAL ::  humidity = .FALSE.                               !< namelist parameter
     1249    LOGICAL ::  humidity_remote = .FALSE.                        !< switch for receiving near-surface humidity flux (atmosphere-ocean coupling)
     1250    LOGICAL ::  inflow_l = .FALSE.                               !< left domain boundary has non-cyclic inflow?
     1251    LOGICAL ::  inflow_n = .FALSE.                               !< north domain boundary has non-cyclic inflow?
     1252    LOGICAL ::  inflow_r = .FALSE.                               !< right domain boundary has non-cyclic inflow?
     1253    LOGICAL ::  inflow_s = .FALSE.                               !< south domain boundary has non-cyclic inflow?
     1254    LOGICAL ::  large_scale_forcing = .FALSE.                    !< namelist parameter
     1255    LOGICAL ::  large_scale_subsidence = .FALSE.                 !< namelist parameter
     1256    LOGICAL ::  land_surface = .FALSE.                           !< use land surface model?
     1257    LOGICAL ::  les_mw = .FALSE.                                 !< use Moeng-Wyngaard turbulence closure for LES mode
     1258    LOGICAL ::  lsf_exception = .FALSE.                          !< use of lsf with buildings (temporary)?
     1259    LOGICAL ::  lsf_surf = .TRUE.                                !< use surface forcing (large scale forcing)?
     1260    LOGICAL ::  lsf_vert = .TRUE.                                !< use atmospheric forcing (large scale forcing)?
     1261    LOGICAL ::  masking_method = .FALSE.                         !< namelist parameter
     1262    LOGICAL ::  microphysics_sat_adjust = .FALSE.                !< use saturation adjust bulk scheme?
     1263    LOGICAL ::  microphysics_kessler = .FALSE.                   !< use kessler bulk scheme?
     1264    LOGICAL ::  microphysics_morrison = .FALSE.                  !< use 2-moment Morrison (add. prog. eq. for nc and qc)
     1265    LOGICAL ::  microphysics_seifert = .FALSE.                   !< use 2-moment Seifert and Beheng scheme
     1266    LOGICAL ::  mg_switch_to_pe0 = .FALSE.                       !< internal multigrid switch for steering the ghost point exchange in case that data has been collected on PE0
     1267    LOGICAL ::  nest_bound_l = .FALSE.                           !< flag indicating nested domain boundary on left side
     1268    LOGICAL ::  nest_bound_n = .FALSE.                           !< flag indicating nested domain boundary on north side
     1269    LOGICAL ::  nest_bound_r = .FALSE.                           !< flag indicating nested domain boundary on right side
     1270    LOGICAL ::  nest_bound_s = .FALSE.                           !< flag indicating nested domain boundary on south side
     1271    LOGICAL ::  nest_domain  = .FALSE.                           !< domain is nested into a parent domain?
     1272    LOGICAL ::  neutral = .FALSE.                                !< namelist parameter
     1273    LOGICAL ::  nudging = .FALSE.                                !< namelist parameter
     1274    LOGICAL ::  ocean = .FALSE.                                  !< namelist parameter
     1275    LOGICAL ::  outflow_l = .FALSE.                              !< left domain boundary has non-cyclic outflow?
     1276    LOGICAL ::  outflow_n = .FALSE.                              !< north domain boundary has non-cyclic outflow?
     1277    LOGICAL ::  outflow_r = .FALSE.                              !< right domain boundary has non-cyclic outflow?
     1278    LOGICAL ::  outflow_s = .FALSE.                              !< south domain boundary has non-cyclic outflow?
     1279    LOGICAL ::  passive_scalar = .FALSE.                         !< namelist parameter
     1280    LOGICAL ::  plant_canopy = .FALSE.                           !< switch for use of plant canopy model
     1281    LOGICAL ::  precipitation = .FALSE.                          !< namelist parameter
     1282    LOGICAL ::  random_heatflux = .FALSE.                        !< namelist parameter
     1283    LOGICAL ::  rans_mode = .FALSE.                              !< switch between RANS and LES mode
     1284    LOGICAL ::  rans_tke_e = .FALSE.                             !< use TKE-e turbulence closure for RANS mode
     1285    LOGICAL ::  rans_tke_l = .FALSE.                             !< use TKE-l turbulence closure for RANS mode
     1286    LOGICAL ::  recycling_yshift = .FALSE.                       !< namelist parameter
     1287    LOGICAL ::  run_control_header = .FALSE.                     !< onetime output of RUN_CONTROL header
     1288    LOGICAL ::  run_coupled = .TRUE.                             !< internal switch telling PALM to run in coupled mode (i.e. to exchange surface data) in case of atmosphere-ocean coupling
     1289    LOGICAL ::  scalar_rayleigh_damping = .TRUE.                 !< namelist parameter
     1290    LOGICAL ::  sloping_surface = .FALSE.                        !< use sloped surface? (namelist parameter alpha_surface)
     1291    LOGICAL ::  spinup = .FALSE.                                 !< perform model spinup without atmosphere code?
     1292    LOGICAL ::  stop_dt = .FALSE.                                !< internal switch to stop the time stepping
     1293    LOGICAL ::  synchronous_exchange = .FALSE.                   !< namelist parameter
     1294    LOGICAL ::  syn_turb_gen = .FALSE.                           !< flag for synthetic turbulence generator module
     1295    LOGICAL ::  syn_turb_gen_prerun = .FALSE.                    !< Was restart data of the sythentic turbulence generator written out?
     1296    LOGICAL ::  terminate_run = .FALSE.                          !< terminate run (cpu-time limit, restarts)?
     1297    LOGICAL ::  topo_no_distinct = .FALSE.                       !< flag controlling classification of topography surfaces
     1298    LOGICAL ::  transpose_compute_overlap = .FALSE.              !< namelist parameter
     1299    LOGICAL ::  turbulent_inflow = .FALSE.                       !< namelist parameter
     1300    LOGICAL ::  turbulent_outflow = .FALSE.                      !< namelist parameter
     1301    LOGICAL ::  urban_surface = .FALSE.                          !< use urban surface model?
     1302    LOGICAL ::  use_cmax = .TRUE.                                !< namelist parameter
     1303    LOGICAL ::  use_initial_profile_as_reference = .FALSE.       !< use of initial profiles as reference state?
     1304    LOGICAL ::  use_prescribed_profile_data = .FALSE.            !< use of prescribed wind profiles?
     1305                                                                 !< (namelist parameters u_profile, v_profile)
     1306    LOGICAL ::  use_single_reference_value = .FALSE.             !< use of single value as reference state?
     1307    LOGICAL ::  use_subsidence_tendencies = .FALSE.              !< namelist parameter
     1308    LOGICAL ::  use_surface_fluxes = .FALSE.                     !< namelist parameter
     1309    LOGICAL ::  use_top_fluxes = .FALSE.                         !< namelist parameter
     1310    LOGICAL ::  use_ug_for_galilei_tr = .TRUE.                   !< namelist parameter
     1311    LOGICAL ::  use_upstream_for_tke = .FALSE.                   !< namelist parameter
     1312    LOGICAL ::  uv_exposure = .FALSE.                            !< switch for uv exposure model
     1313    LOGICAL ::  virtual_flight = .FALSE.                         !< use virtual flight model?
     1314    LOGICAL ::  virtual_flight_prerun = .FALSE.                  !< Was restart data of the virtual flight model written out?
     1315    LOGICAL ::  wall_adjustment = .TRUE.                         !< namelist parameter
     1316    LOGICAL ::  wind_turbine = .FALSE.                           !< flag for use of wind turbine model
     1317    LOGICAL ::  wind_turbine_prerun = .FALSE.                    !< Was restart data of the wtm model written out?
     1318    LOGICAL ::  write_binary = .FALSE.                           !< ENVPAR namelist parameter to steer restart I/O (ENVPAR is created by mrun)
     1319    LOGICAL ::  ws_scheme_sca = .FALSE.                          !< use Wicker-Skamarock scheme (scalar advection)?
     1320    LOGICAL ::  ws_scheme_mom = .FALSE.                          !< use Wicker-Skamarock scheme (momentum advection)?
    13141321
    13151322    LOGICAL ::  data_output_xy(0:1) = .FALSE.                !< output of xy cross-section data?
  • palm/trunk/SOURCE/read_var_list.f90

    r2718 r2776  
    2525! -----------------
    2626! $Id$
     27! Change skip_var_list: Skipping of module related parameter is only necessary
     28! if restart data was outputted at the end of the precursor run
     29!
     30! 2718 2018-01-02 08:49:38Z maronga
    2731! Corrected "Former revisions" section
    2832!
     
    10941098
    10951099    USE control_parameters,                                                    &
    1096         ONLY: wind_turbine, virtual_flight, synthetic_turbulence_generator
     1100        ONLY: wind_turbine, wind_turbine_prerun, virtual_flight,               &
     1101              virtual_flight_prerun, syn_turb_gen, syn_turb_gen_prerun
    10971102
    10981103    USE wind_turbine_model_mod,                                                &
     
    11281133!-- In case of virtual flights, skip also variables related to
    11291134!-- this module.
    1130     IF ( wind_turbine )  CALL wtm_skip_var_list
     1135    IF ( wind_turbine_prerun )  CALL wtm_skip_var_list
    11311136
    11321137!
    11331138!-- In case of virtual flights, skip also variables related to
    11341139!-- this module.
    1135     IF ( virtual_flight )  CALL flight_skip_var_list
     1140    IF ( virtual_flight_prerun)  CALL flight_skip_var_list
    11361141
    11371142!
    11381143!-- In case of virtual flights, skip also variables related to
    11391144!-- this module.
    1140     IF ( synthetic_turbulence_generator )  CALL stg_skip_var_list
     1145    IF ( syn_turb_gen_prerun )  CALL stg_skip_var_list
    11411146
    11421147
  • palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

    r2716 r2776  
    2525! -----------------
    2626! $Id$
     27! Variable synthetic_turbulence_generator use_synthetic_turbulence_generator has
     28! been abbreviated + syn_turb_gen_prerun flag is used to define if module
     29! related parameters were outputted as restart data
     30!
     31! 2716 2017-12-29 16:35:59Z kanani
    2732! Corrected "Former revisions" section
    2833!
     
    8388    USE control_parameters,                                                    &
    8489        ONLY:  initializing_actions, message_string,                           &
    85                synthetic_turbulence_generator
     90               syn_turb_gen, syn_turb_gen_prerun
    8691
    8792    USE cpulog,                                                                &
     
    104109    IMPLICIT NONE
    105110
    106     LOGICAL :: velocity_seed_initialized = .FALSE.           !< true after first call of stg_main
    107     LOGICAL :: use_synthetic_turbulence_generator = .FALSE.  !< switch to use synthetic turbulence generator
     111    LOGICAL :: velocity_seed_initialized = .FALSE.  !< true after first call of stg_main
     112    LOGICAL :: use_syn_turb_gen = .FALSE.           !< switch to use synthetic turbulence generator
    108113
    109114    INTEGER(iwp) :: stg_type_yz        !< MPI type for full z range
     
    221226!
    222227!-- Public variables
    223     PUBLIC  use_synthetic_turbulence_generator
     228    PUBLIC  use_syn_turb_gen
    224229
    225230
     
    241246    IMPLICIT NONE
    242247
    243     IF ( use_synthetic_turbulence_generator )  THEN
     248    IF ( use_syn_turb_gen )  THEN
    244249
    245250       IF ( INDEX( initializing_actions, 'set_constant_profiles' ) == 0  .AND. &
     
    288293!-- Write synthetic turbulence generator Header
    289294    WRITE( io, 1 )
    290     IF ( use_synthetic_turbulence_generator )  THEN
     295    IF ( use_syn_turb_gen )  THEN
    291296       WRITE( io, 2 )
    292297    ELSE
     
    665670
    666671
    667     NAMELIST /stg_par/   use_synthetic_turbulence_generator
     672    NAMELIST /stg_par/   use_syn_turb_gen
    668673
    669674    line = ' '
     
    685690!-- Set flag that indicates that the synthetic turbulence generator is switched
    686691!-- on
    687     synthetic_turbulence_generator = .TRUE.
     692    syn_turb_gen = .TRUE.
    688693
    689694    IF ( TRIM( initializing_actions ) == 'read_restart_data' ) THEN
     
    738743       SELECT CASE ( TRIM( variable_chr ) )
    739744
    740           CASE ( 'use_synthetic_turbulence_generator ' )
    741              READ ( 13 )  use_synthetic_turbulence_generator
     745          CASE ( 'use_syn_turb_gen' )
     746             READ ( 13 )  use_syn_turb_gen
    742747          CASE ( 'mc_factor' )
    743748             READ ( 13 )  mc_factor
     749          CASE ( 'syn_turb_gen_prerun' )
     750             READ ( 13 )  syn_turb_gen_prerun
    744751
    745752       END SELECT
     
    762769    IMPLICIT NONE
    763770
    764     WRITE ( 14 )  'use_synthetic_turbulence_generator '
    765     WRITE ( 14 )  use_synthetic_turbulence_generator
    766     WRITE ( 14 )  'mc_factor           '
     771    syn_turb_gen_prerun = .TRUE.
     772
     773    WRITE ( 14 )  'use_syn_turb_gen              '
     774    WRITE ( 14 )  use_syn_turb_gen
     775    WRITE ( 14 )  'mc_factor                     '
    767776    WRITE ( 14 )  mc_factor
    768 
    769     WRITE ( 14 )  '*** end stg module ***            '
     777    WRITE ( 14 )  'syn_turb_gen_prerun           '
     778    WRITE ( 14 )  syn_turb_gen_prerun
     779
     780    WRITE ( 14 )  '*** end stg module ***        '
    770781
    771782END SUBROUTINE stg_write_restart_data
  • palm/trunk/SOURCE/time_integration.f90

    r2773 r2776  
    2525! -----------------
    2626! $Id$
     27! Variable use_synthetic_turbulence_generator has been abbreviated
     28!
     29! 2773 2018-01-30 14:12:54Z suehring
    2730! - Nesting for chemical species
    2831!
     
    438441
    439442    USE synthetic_turbulence_generator_mod,                                    &
    440         ONLY:  stg_main, use_synthetic_turbulence_generator
     443        ONLY:  stg_main, use_syn_turb_gen
    441444
    442445    USE user_actions_mod,                                                      &
     
    798801!
    799802!--       Impose a turbulent inflow using synthetic generated turbulence
    800          IF ( use_synthetic_turbulence_generator ) THEN
     803         IF ( use_syn_turb_gen ) THEN
    801804            CALL  stg_main
    802805         ENDIF
  • palm/trunk/SOURCE/virtual_flight_mod.f90

    r2718 r2776  
    2525! -----------------
    2626! $Id$
     27! virutal_flight_prerun flag is used to define if module
     28! related parameters were outputted as restart data
     29!
     30! 2718 2018-01-02 08:49:38Z maronga
    2731! Corrected "Former revisions" section
    2832!
     
    6266 
    6367    USE control_parameters,                                                    &
    64         ONLY:  fl_max, num_leg, num_var_fl, num_var_fl_user, virtual_flight
     68        ONLY:  fl_max, num_leg, num_var_fl, num_var_fl_user, virtual_flight,   &
     69               virtual_flight_prerun
    6570 
    6671    USE kinds
     
    935940                IF ( .NOT. ALLOCATED( z_pos ) )  ALLOCATE( z_pos(1:num_leg) )
    936941                READ ( 13 )  z_pos
     942             CASE ( 'virtual_flight_prerun' )
     943                READ ( 13 )  virtual_flight_prerun
    937944         
    938945          END SELECT
     
    952959
    953960       IMPLICIT NONE
     961
     962       virtual_flight_prerun = .TRUE.
    954963       
    955964       WRITE ( 14 )  'u_agl                         '
     
    965974       WRITE ( 14 )  'z_pos                         '
    966975       WRITE ( 14 )  z_pos
     976       WRITE ( 14 )  'virtual_flight_prerun         '
     977       WRITE ( 14 )  virtual_flight_prerun
    967978       
    968979       WRITE ( 14 )  '*** end flight ***            '
  • palm/trunk/SOURCE/wind_turbine_model_mod.f90

    r2718 r2776  
    2626! -----------------
    2727! $Id$
     28! wind_turbine_prerun flag is used to define if module
     29! related parameters were outputted as restart data
     30!
     31! 2718 2018-01-02 08:49:38Z maronga
    2832! Corrected "Former revisions" section
    2933!
     
    124128    USE control_parameters,                                                    &
    125129        ONLY:  coupling_char, dt_3d, dz, message_string, simulated_time,       &
    126                wind_turbine, initializing_actions
     130               wind_turbine, wind_turbine_prerun, initializing_actions
    127131
    128132    USE cpulog,                                                                &
     
    543547
    544548       IMPLICIT NONE
     549
     550       wind_turbine_prerun = .TRUE.
    545551       
    546552       WRITE ( 14 )  'omega_gen                     '
     
    564570       WRITE ( 14 )  'torque_gen_old                '
    565571       WRITE ( 14 )  torque_gen_old
     572       WRITE ( 14 )  'wind_turbine_prerun           '
     573       WRITE ( 14 )  wind_turbine_prerun
    566574     
    567575       WRITE ( 14 )  '*** end wtm ***               '
     
    608616          CASE ( 'torque_gen_old' )
    609617             READ ( 13 )  torque_gen_old
     618          CASE ( 'wind_turbine_prerun' )
     619             READ ( 13 )  wind_turbine_prerun
    610620
    611621       END SELECT
     
    14571467!--          Interpolation of lift and drag coefficiencts on fine grid of radius
    14581468!--          segments and angles of attack
    1459 
    14601469             turb_cl_tab(iialpha,iir) = ( alpha_attack_tab(ialpha) -           &
    14611470                                          alpha_attack_i ) /                   &
  • palm/trunk/SOURCE/write_var_list.f90

    r2718 r2776  
    2525! -----------------
    2626! $Id$
     27! Variable synthetic_turbulence_generator has been abbreviated
     28!
     29! 2718 2018-01-02 08:49:38Z maronga
    2730! Corrected "Former revisions" section
    2831!
     
    788791
    789792!
    790 !-- If required, write restart data for virtual measurements.
    791     IF ( synthetic_turbulence_generator )  CALL stg_write_restart_data
     793!-- If required, write restart data for turbulence generator.
     794    IF ( syn_turb_gen )  CALL stg_write_restart_data
    792795
    793796
Note: See TracChangeset for help on using the changeset viewer.