Changeset 2563 for palm/trunk/SOURCE/read_var_list.f90

Timestamp:

Oct 19, 2017 3:36:10 PM (7 years ago)

Author:

Giersch

Message:

Restart runs with the usage of the wind turbine model are possible now. Further small at reading/writing restart data

File:

• palm/trunk/SOURCE/read_var_list.f90 (modified) (9 diffs)

palm/trunk/SOURCE/read_var_list.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! CALL stg_read_restart_data moved to synthetic_turbulence_generator_mod and
+! CALL flight_read_restart_data moved to virtual_flights_mod. Furthermore 
+! *** end default *** marks the end of the standard parameter list of restart
+! files and *** end *** marks the end of all parameter including module
+! parameter. Therefore the call of flight_skip_var_list becomes unnecessary.
+! 
+! 2372 2017-08-25 12:37:32Z sward
 ! y_shift added to vars, version no. increased
 ! 
@@ -220 +227 @@
     USE control_parameters
 
-    USE flight_mod,                                                            &
-        ONLY:  flight_read_restart_data
-
     USE grid_variables,                                                        &
         ONLY:  dx, dy
@@ -255 +259 @@
                v_max, v_max_ijk, w_max, w_max_ijk
 
-    USE synthetic_turbulence_generator_mod,                                    &
-        ONLY:  stg_read_restart_data
-
     USE vertical_nesting_mod,                                                  &
         ONLY:  vnest_init
@@ -272 +273 @@
 !-- Make version number check first
     READ ( 13 )  version_on_file
-    binary_version = '4.2'
+    binary_version = '4.3'
     IF ( TRIM( version_on_file ) /= TRIM( binary_version ) )  THEN
        WRITE( message_string, * ) 'version mismatch concerning control ', &
@@ -349 +350 @@
 !--          increased. The same changes must also be done in write_var_list.
     READ ( 13 )  variable_chr
-    DO  WHILE ( TRIM( variable_chr ) /= '*** end ***' )
+    DO  WHILE ( TRIM( variable_chr ) /= '*** end default ***' )
 
        SELECT CASE ( TRIM( variable_chr ) )
@@ -842 +843 @@
     ENDDO
 
-    IF ( virtual_flight )  CALL flight_read_restart_data
-
-    IF ( synthetic_turbulence_generator )  CALL stg_read_restart_data
 
  END SUBROUTINE read_var_list
@@ -984 +982 @@
     READ ( 13 )  variable_chr
 
-    DO  WHILE ( TRIM( variable_chr ) /= '*** end ***' )
+    DO  WHILE ( TRIM( variable_chr ) /= '*** end default ***' )
 
        SELECT CASE ( TRIM( variable_chr ) )
@@ -1072 +1070 @@
  SUBROUTINE skip_var_list
 
-    USE control_parameters,                                                    &
-        ONLY:  virtual_flight
-
-    USE flight_mod,                                                            &
-        ONLY:  flight_skip_var_list
 
     IMPLICIT NONE
@@ -1096 +1089 @@
 
     ENDDO
-!
-!-- In case of virtual flights, skip also variables related to
-!-- this module.
-    IF ( virtual_flight )  CALL flight_skip_var_list