Changeset 4848 for palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

Timestamp:

Jan 21, 2021 3:51:51 PM (3 years ago)

Author:

gronemeier

Message:

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

File:

• palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90 (modified) (11 diffs)

palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! replaced use_syn_turb_gen by syn_turb_gen
+!
+! 4843 2021-01-15 15:22:11Z raasch
 ! local namelist parameter added to switch off the module although the respective module namelist
 ! appears in the namelist file
@@ -365 +368 @@
     LOGICAL ::  parametrize_inflow_turbulence = .FALSE.  !< flag indicating that inflow turbulence is either read from file
                                                          !< (.FALSE.) or if it parametrized
-    LOGICAL ::  use_syn_turb_gen              = .FALSE.  !< switch to use synthetic turbulence generator
     LOGICAL ::  velocity_seed_initialized     = .FALSE.  !< true after first call of stg_main
 
@@ -519 +521 @@
             parametrize_inflow_turbulence,                                                         &
             time_stg_adjust,                                                                       &
-            time_stg_call,                                                                         &
-            use_syn_turb_gen
+            time_stg_call
 
 
@@ -533 +534 @@
  SUBROUTINE stg_check_parameters
 
-    IF ( .NOT. use_syn_turb_gen  .AND.  .NOT. rans_mode  .AND.                                     &
+    IF ( .NOT. syn_turb_gen  .AND.  .NOT. rans_mode  .AND.                                     &
           nesting_offline )  THEN
        message_string = 'Synthetic turbulence generator is required ' //                           &
@@ -540 +541 @@
     ENDIF
 
-    IF ( .NOT. use_syn_turb_gen  .AND.  child_domain                                               &
+    IF ( .NOT. syn_turb_gen  .AND.  child_domain                                               &
          .AND. rans_mode_parent  .AND.  .NOT. rans_mode )  THEN
        message_string = 'Synthetic turbulence generator is required when nesting is applied ' //   &
@@ -547 +548 @@
     ENDIF
 
-    IF ( use_syn_turb_gen )  THEN
+    IF ( syn_turb_gen )  THEN
 
        IF ( child_domain  .AND.  .NOT. rans_mode  .AND.  .NOT. rans_mode_parent )  THEN
@@ -613 +614 @@
 !
 !-- Write synthetic turbulence generator Header
-    WRITE( io, 1 )
-    IF ( use_syn_turb_gen )  THEN
-       WRITE( io, 2 )
-    ELSE
-       WRITE( io, 3 )
-    ENDIF
-
-    IF ( parametrize_inflow_turbulence )  THEN
-       WRITE( io, 4 ) dt_stg_adjust
-    ELSE
-       WRITE( io, 5 )
+    IF ( syn_turb_gen )  THEN
+       WRITE( io, 1 )
+       IF ( parametrize_inflow_turbulence )  THEN
+          WRITE( io, 4 ) dt_stg_adjust
+       ELSE
+          WRITE( io, 5 )
+       ENDIF
     ENDIF
 
 1   FORMAT (//' Synthetic turbulence generator information:'/                                      &
               ' ------------------------------------------'/)
-2   FORMAT ('    synthetic turbulence generator is switched on')
-3   FORMAT ('    synthetic turbulence generator is switched off')
 4   FORMAT ('    imposed turbulence statistics are parametrized and ajdusted to boundary-layer development each ', F8.2, ' s' )
 5   FORMAT ('    imposed turbulence is read from file' )
@@ -1228 +1223 @@
                         dt_stg_adjust,                                                             &
                         dt_stg_call,                                                               &
-                        switch_off_module,                                                         &
-                        use_syn_turb_gen
+                        switch_off_module
 
 
@@ -1278 +1272 @@
           READ ( 13 )  time_stg_call
 
-       CASE ( 'use_syn_turb_gen' )
-          READ ( 13 )  use_syn_turb_gen
-
        CASE DEFAULT
 
@@ -1300 +1291 @@
     CALL rrd_mpi_io( 'time_stg_adjust', time_stg_adjust )
     CALL rrd_mpi_io( 'time_stg_call', time_stg_call )
-    CALL rrd_mpi_io( 'use_syn_turb_gen', use_syn_turb_gen )
 
  END SUBROUTINE stg_rrd_global_mpi
@@ -1320 +1310 @@
        WRITE ( 14 )  time_stg_call
 
-       CALL wrd_write_string( 'use_syn_turb_gen' )
-       WRITE ( 14 )  use_syn_turb_gen
-
     ELSEIF ( restart_data_format_output(1:3) == 'mpi' )  THEN
 
        CALL wrd_mpi_io( 'time_stg_adjust', time_stg_adjust )
        CALL wrd_mpi_io( 'time_stg_call', time_stg_call )
-       CALL wrd_mpi_io( 'use_syn_turb_gen', use_syn_turb_gen )
 
     ENDIF