Changeset 4848


Ignore:
Timestamp:
Jan 21, 2021 3:51:51 PM (9 months ago)
Author:
gronemeier
Message:

bugfix: removed syn_turb_gen from restart files, replaced use_syn_turb_gen by syn_turb_gen

Location:
palm/trunk/SOURCE
Files:
6 edited

Legend:

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

    r4845 r4848  
    2424! -----------------
    2525! $Id$
     26! replaced use_syn_turb_gen by syn_turb_gen
     27!
     28! 4845 2021-01-18 11:15:37Z raasch
    2629! removed allocation and initialization of arrays required for radiation boundary conditions
    2730!
     
    233236
    234237    USE synthetic_turbulence_generator_mod,                                                        &
    235         ONLY:  stg_init, use_syn_turb_gen
     238        ONLY:  stg_init
    236239
    237240    USE surface_layer_fluxes_mod,                                                                  &
     
    18301833!
    18311834!-- Initialization of synthetic turbulence generator
    1832     IF ( use_syn_turb_gen )  CALL stg_init
     1835    IF ( syn_turb_gen )  CALL stg_init
    18331836!
    18341837!-- Initializing actions for all other modules
  • palm/trunk/SOURCE/init_pegrid.f90

    r4648 r4848  
    2121! -----------------
    2222! $Id$
     23! replaced use_syn_turb_gen by syn_turb_gen
     24!
     25! 4648 2020-08-25 07:52:08Z raasch
    2326! file re-formatted to follow the PALM coding standard
    2427!
     
    9598        ONLY:  coupling_mode, coupling_topology, gathered_size, momentum_advec,                    &
    9699               outflow_source_plane, recycling_width, scalar_advec, subdomain_size,                &
    97                turbulent_inflow, turbulent_outflow, y_shift
     100               syn_turb_gen, turbulent_inflow, turbulent_outflow, y_shift
    98101
    99102    USE grid_variables,                                                                            &
     
    123126
    124127    USE synthetic_turbulence_generator_mod,                                                        &
    125         ONLY:  id_stg_left, id_stg_north, id_stg_right, id_stg_south, use_syn_turb_gen
     128        ONLY:  id_stg_left, id_stg_north, id_stg_right, id_stg_south
    126129#endif
    127130
     
    11581161!-- Please note, if no forcing or nesting is applied, the generator is applied only at the left
    11591162!-- lateral boundary.
    1160     IF ( use_syn_turb_gen )  THEN
     1163    IF ( syn_turb_gen )  THEN
    11611164       IF ( bc_dirichlet_l )  THEN
    11621165          id_stg_left_l = myidx
  • palm/trunk/SOURCE/read_restart_data_mod.f90

    r4845 r4848  
    2525! -----------------
    2626! $Id$
     27! bugfix: removed syn_turb_gen from restart files
     28!
     29! 4845 2021-01-18 11:15:37Z raasch
    2730! arrays removed that were required for radiation boundary conditions
    2831!
     
    4245! Bugfix in allocation of hom and hom_sum in case of mpi-io restart when
    4346! chemistry or salsa are employed
    44 ! 
     47!
    4548! 4580 2020-06-29 07:54:21Z raasch
    4649! data handling with MPI-IO for cyclic-fill added (so far only for global data)
    47 ! 
     50!
    4851! 4564 2020-06-12 14:03:36Z raasch
    4952! Vertical nesting method of Huq et al. (2019) removed
    50 ! 
     53!
    5154! 4539 2020-05-18 14:05:17Z raasch
    5255! location message added
    53 ! 
     56!
    5457! 4536 2020-05-17 17:24:13Z raasch
    5558! binary version incremented
    56 ! 
     59!
    5760! 4534 2020-05-14 18:35:22Z raasch
    5861! adjustments for I/O on reduced number of cores using shared memory MPI
    59 ! 
     62!
    6063! 4518 2020-05-04 15:44:28Z suehring
    6164! Move input of diagnostic output quantities to doq_rrd_local
    62 ! 
     65!
    6366! 4517 2020-05-03 14:29:30Z raasch
    6467! qsurf and ssurf added
    65 ! 
     68!
    6669! 4498 2020-04-15 14:26:31Z raasch
    6770! argument removed from rd_mpi_io_open
    68 ! 
     71!
    6972! 4496 2020-04-15 08:37:26Z raasch
    7073! bugfix: MPI barrier removed, coupling character added to input filename
    71 ! 
     74!
    7275! 4495 2020-04-13 20:11:20Z raasch
    7376! restart data handling with MPI-IO added
    74 ! 
     77!
    7578! 4435 2020-03-03 10:38:41Z raasch
    7679! bugfix for message that reports about files that are read from in case that the virtual PE grid
    7780! has chenged (in case of large number of files format was exceeded), detailed messages about the
    7881! files are now output to the debug file
    79 ! 
     82!
    8083! 4431 2020-02-27 23:23:01Z gronemeier
    8184! added u_center_av, v_center_av, wspeed_av
     
    283286       READ ( 13 )  version_on_file
    284287
    285        binary_version_global = '5.1'
     288       binary_version_global = '5.2'
    286289       IF ( TRIM( version_on_file ) /= TRIM( binary_version_global ) )  THEN
    287290          WRITE( message_string, * ) 'version mismatch concerning ',           &
     
    10931096       CALL rrd_mpi_io( 'surface_scalarflux', surface_scalarflux )
    10941097       CALL rrd_mpi_io( 'surface_waterflux', surface_waterflux )
    1095        CALL rrd_mpi_io( 'syn_turb_gen', syn_turb_gen )
    10961098       CALL rrd_mpi_io( 'time_coupling', time_coupling )
    10971099       CALL rrd_mpi_io( 'time_disturb', time_disturb )
  • palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

    r4843 r4848  
    2525! -----------------
    2626! $Id$
     27! replaced use_syn_turb_gen by syn_turb_gen
     28!
     29! 4843 2021-01-15 15:22:11Z raasch
    2730! local namelist parameter added to switch off the module although the respective module namelist
    2831! appears in the namelist file
     
    365368    LOGICAL ::  parametrize_inflow_turbulence = .FALSE.  !< flag indicating that inflow turbulence is either read from file
    366369                                                         !< (.FALSE.) or if it parametrized
    367     LOGICAL ::  use_syn_turb_gen              = .FALSE.  !< switch to use synthetic turbulence generator
    368370    LOGICAL ::  velocity_seed_initialized     = .FALSE.  !< true after first call of stg_main
    369371
     
    519521            parametrize_inflow_turbulence,                                                         &
    520522            time_stg_adjust,                                                                       &
    521             time_stg_call,                                                                         &
    522             use_syn_turb_gen
     523            time_stg_call
    523524
    524525
     
    533534 SUBROUTINE stg_check_parameters
    534535
    535     IF ( .NOT. use_syn_turb_gen  .AND.  .NOT. rans_mode  .AND.                                     &
     536    IF ( .NOT. syn_turb_gen  .AND.  .NOT. rans_mode  .AND.                                     &
    536537          nesting_offline )  THEN
    537538       message_string = 'Synthetic turbulence generator is required ' //                           &
     
    540541    ENDIF
    541542
    542     IF ( .NOT. use_syn_turb_gen  .AND.  child_domain                                               &
     543    IF ( .NOT. syn_turb_gen  .AND.  child_domain                                               &
    543544         .AND. rans_mode_parent  .AND.  .NOT. rans_mode )  THEN
    544545       message_string = 'Synthetic turbulence generator is required when nesting is applied ' //   &
     
    547548    ENDIF
    548549
    549     IF ( use_syn_turb_gen )  THEN
     550    IF ( syn_turb_gen )  THEN
    550551
    551552       IF ( child_domain  .AND.  .NOT. rans_mode  .AND.  .NOT. rans_mode_parent )  THEN
     
    613614!
    614615!-- Write synthetic turbulence generator Header
    615     WRITE( io, 1 )
    616     IF ( use_syn_turb_gen )  THEN
    617        WRITE( io, 2 )
    618     ELSE
    619        WRITE( io, 3 )
    620     ENDIF
    621 
    622     IF ( parametrize_inflow_turbulence )  THEN
    623        WRITE( io, 4 ) dt_stg_adjust
    624     ELSE
    625        WRITE( io, 5 )
     616    IF ( syn_turb_gen )  THEN
     617       WRITE( io, 1 )
     618       IF ( parametrize_inflow_turbulence )  THEN
     619          WRITE( io, 4 ) dt_stg_adjust
     620       ELSE
     621          WRITE( io, 5 )
     622       ENDIF
    626623    ENDIF
    627624
    6286251   FORMAT (//' Synthetic turbulence generator information:'/                                      &
    629626              ' ------------------------------------------'/)
    630 2   FORMAT ('    synthetic turbulence generator is switched on')
    631 3   FORMAT ('    synthetic turbulence generator is switched off')
    6326274   FORMAT ('    imposed turbulence statistics are parametrized and ajdusted to boundary-layer development each ', F8.2, ' s' )
    6336285   FORMAT ('    imposed turbulence is read from file' )
     
    12281223                        dt_stg_adjust,                                                             &
    12291224                        dt_stg_call,                                                               &
    1230                         switch_off_module,                                                         &
    1231                         use_syn_turb_gen
     1225                        switch_off_module
    12321226
    12331227
     
    12781272          READ ( 13 )  time_stg_call
    12791273
    1280        CASE ( 'use_syn_turb_gen' )
    1281           READ ( 13 )  use_syn_turb_gen
    1282 
    12831274       CASE DEFAULT
    12841275
     
    13001291    CALL rrd_mpi_io( 'time_stg_adjust', time_stg_adjust )
    13011292    CALL rrd_mpi_io( 'time_stg_call', time_stg_call )
    1302     CALL rrd_mpi_io( 'use_syn_turb_gen', use_syn_turb_gen )
    13031293
    13041294 END SUBROUTINE stg_rrd_global_mpi
     
    13201310       WRITE ( 14 )  time_stg_call
    13211311
    1322        CALL wrd_write_string( 'use_syn_turb_gen' )
    1323        WRITE ( 14 )  use_syn_turb_gen
    1324 
    13251312    ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
    13261313
    13271314       CALL wrd_mpi_io( 'time_stg_adjust', time_stg_adjust )
    13281315       CALL wrd_mpi_io( 'time_stg_call', time_stg_call )
    1329        CALL wrd_mpi_io( 'use_syn_turb_gen', use_syn_turb_gen )
    13301316
    13311317    ENDIF
  • palm/trunk/SOURCE/time_integration.f90

    r4828 r4848  
    2525! -----------------
    2626! $Id$
     27! replaced use_syn_turb_gen by syn_turb_gen
     28!
     29! 4828 2021-01-05 11:21:41Z Giersch
    2730! Remove leftover write statement from debugging
    2831!
     
    4649! 4668 2020-09-09 13:00:16Z pavelkrc
    4750! Improve debug messages during timestepping
    48 ! 
     51!
    4952! 4581 2020-06-29 08:49:58Z suehring
    5053! Omit explicit pressure forcing via geostrophic wind components in case of
    5154! mesoscale nesting.
    52 ! 
     55!
    5356! 4578 2020-06-25 15:43:32Z gronemeier
    5457! bugfix: removed unused variables
     
    308311               skip_time_do2d_yz, skip_time_do3d, skip_time_domask, skip_time_dopr,                &
    309312               skip_time_data_output_av, sloping_surface, stop_dt, surface_output,                 &
     313               syn_turb_gen,                                                                       &
    310314               terminate_coupled, terminate_run, timestep_scheme, time_coupling, time_do2d_xy,     &
    311315               time_do2d_xz, time_do2d_yz, time_do3d, time_domask, time_dopr, time_dopr_av,        &
     
    421425    USE synthetic_turbulence_generator_mod,                                                        &
    422426        ONLY:  dt_stg_call, dt_stg_adjust, parametrize_inflow_turbulence, stg_adjust, stg_main,    &
    423                time_stg_adjust, time_stg_call, use_syn_turb_gen
     427               time_stg_adjust, time_stg_call
    424428
    425429    USE turbulence_closure_mod,                                                                    &
     
    926930!
    927931!--       Impose a turbulent inflow using synthetic generated turbulence.
    928           IF ( use_syn_turb_gen  .AND.                                                             &
     932          IF ( syn_turb_gen  .AND.                                                                 &
    929933               intermediate_timestep_count == intermediate_timestep_count_max )  THEN
    930934             CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'start' )
     
    12441248!--    information, update the time counter and if required, adjust the
    12451249!--    STG to new atmospheric conditions.
    1246        IF ( use_syn_turb_gen  )  THEN
     1250       IF ( syn_turb_gen  )  THEN
    12471251          IF ( parametrize_inflow_turbulence )  THEN
    12481252             time_stg_adjust = time_stg_adjust + dt_3d
  • palm/trunk/SOURCE/write_restart_data_mod.f90

    r4845 r4848  
    2424! -----------------
    2525! $Id$
     26! bugfix: removed syn_turb_gen from restart files
     27!
     28! 4845 2021-01-18 11:15:37Z raasch
    2629! arrays removed that were required for radiation boundary conditions
    2730!
     
    3437! 4671 2020-09-09 20:27:58Z pavelkrc
    3538! Implementation of downward facing USM and LSM surfaces
    36 ! 
     39!
    3740! 4564 2020-06-12 14:03:36Z raasch
    3841! Vertical nesting method of Huq et al. (2019) removed
    39 ! 
     42!
    4043! 4536 2020-05-17 17:24:13Z raasch
    4144! binary version incremented
    42 ! 
     45!
    4346! 4535 2020-05-15 12:07:23Z raasch
    4447! bugfix for restart data format query
    45 ! 
     48!
    4649! 4514 2020-04-30 16:29:59Z suehring
    4750! qsurf and ssurf added
    48 ! 
     51!
    4952! 4495 2020-04-13 20:11:20Z raasch
    5053! restart data handling with MPI-IO added
    51 ! 
     54!
    5255! 4489 2020-04-04 10:54:08Z raasch
    5356! file re-formatted to follow the PALM coding standard
     
    198201    INTEGER ::  i                                !< loop index
    199202
    200     binary_version_global = '5.1'
     203    binary_version_global = '5.2'
    201204
    202205    IF ( restart_data_format_output == 'fortran_binary' )  THEN
     
    10761079       CALL wrd_mpi_io( 'surface_scalarflux', surface_scalarflux )
    10771080       CALL wrd_mpi_io( 'surface_waterflux', surface_waterflux )
    1078        CALL wrd_mpi_io( 'syn_turb_gen', syn_turb_gen )
    10791081       CALL wrd_mpi_io( 'time_coupling', time_coupling )
    10801082       CALL wrd_mpi_io( 'time_disturb', time_disturb )
Note: See TracChangeset for help on using the changeset viewer.