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

Timestamp:

Oct 24, 2017 1:49:46 PM (7 years ago)

Author:

Giersch

Message:

Bugfixes for restart runs

File:

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

palm/trunk/SOURCE/read_var_list.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! *** end *** marks the end of the standard parameter list of restart files
+! like it was before revision 2563. To skip also the variables of the modules  
+! wind_turbine_model_mod, flight_mod and synthetic_turbulence_generator_mod 
+! three new functions has to be defined which are called in skip_var_list.
+! Adapted binary version number 
+! 
+! 2575 2017-10-24 09:57:58Z maronga
 ! Renamed phi -> latitude, added longitude
 ! 
@@ -276 +283 @@
 !-- Make version number check first
     READ ( 13 )  version_on_file
-    binary_version = '4.3'
+    binary_version = '4.4'
     IF ( TRIM( version_on_file ) /= TRIM( binary_version ) )  THEN
        WRITE( message_string, * ) 'version mismatch concerning control ', &
@@ -353 +360 @@
 !--          increased. The same changes must also be done in write_var_list.
     READ ( 13 )  variable_chr
-    DO  WHILE ( TRIM( variable_chr ) /= '*** end default ***' )
+    DO  WHILE ( TRIM( variable_chr ) /= '*** end ***' )
 
        SELECT CASE ( TRIM( variable_chr ) )
@@ -987 +994 @@
     READ ( 13 )  variable_chr
 
-    DO  WHILE ( TRIM( variable_chr ) /= '*** end default ***' )
+    DO  WHILE ( TRIM( variable_chr ) /= '*** end ***' )
 
        SELECT CASE ( TRIM( variable_chr ) )
@@ -1075 +1082 @@
  SUBROUTINE skip_var_list
 
+    USE control_parameters,                                                    &
+        ONLY: wind_turbine, virtual_flight, synthetic_turbulence_generator
+
+    USE wind_turbine_model_mod,                                                &
+        ONLY: wtm_skip_var_list
+
+    USE flight_mod,                                                            &
+        ONLY: flight_skip_var_list
+
+    USE synthetic_turbulence_generator_mod,                                    &
+        ONLY: stg_skip_var_list
+
 
     IMPLICIT NONE
@@ -1095 +1114 @@
     ENDDO
 
+!
+!-- In case of virtual flights, skip also variables related to
+!-- this module.
+    IF ( wind_turbine )  CALL wtm_skip_var_list
+
+!
+!-- In case of virtual flights, skip also variables related to
+!-- this module.
+    IF ( virtual_flight )  CALL flight_skip_var_list
+
+!
+!-- In case of virtual flights, skip also variables related to
+!-- this module.
+    IF ( synthetic_turbulence_generator )  CALL stg_skip_var_list
+
 
  END SUBROUTINE skip_var_list