Changeset 2563 for palm/trunk/SOURCE/virtual_flight_mod.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/virtual_flight_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/virtual_flight_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! flight_read_restart_data is called in flight_parin in the case of a restart 
+! run. flight_skip_var_list is not necessary anymore due to marker changes in
+! restart files.
+! 
+! 2271 2017-06-09 12:34:55Z sward
 ! Todo added
 ! 
@@ -115 +120 @@
     END INTERFACE flight_measurement
     
-    INTERFACE flight_skip_var_list 
-       MODULE PROCEDURE flight_skip_var_list
-    END INTERFACE flight_skip_var_list
-    
     INTERFACE flight_read_restart_data 
        MODULE PROCEDURE flight_read_restart_data
@@ -133 +134 @@
 !-- Public interfaces
     PUBLIC flight_init, flight_header, flight_parin, flight_measurement,       &
-           flight_skip_var_list, flight_read_restart_data,                     &
-           flight_write_restart_data
+           flight_write_restart_data                    
 !
 !-- Public variables
@@ -192 +192 @@
     SUBROUTINE flight_parin 
 
-    
+       USE control_parameters,                                                 &
+           ONLY:  initializing_actions  
+      
        IMPLICIT NONE
 
@@ -216 +218 @@
 !--    Set switch that virtual flights shall be carried out
        virtual_flight = .TRUE.
+
+       IF ( TRIM( initializing_actions ) == 'read_restart_data' ) THEN
+          CALL flight_read_restart_data
+       ENDIF
 
  10    CONTINUE
@@ -854 +860 @@
 
     END SUBROUTINE flight_check_parameters
-    
-!------------------------------------------------------------------------------!
-! Description:
-! ------------
-!> Skipping the flight-module variables from restart-file (binary format).
-!------------------------------------------------------------------------------!
-    SUBROUTINE flight_skip_var_list  
-           
-       IMPLICIT NONE
-       
-       CHARACTER (LEN=1)  ::  cdum
-       CHARACTER (LEN=30) ::  variable_chr
-       
-       READ ( 13 )  variable_chr
-       DO  WHILE ( TRIM( variable_chr ) /= '*** end flight ***' )
-          READ ( 13 )  cdum
-          READ ( 13 )  variable_chr
-       ENDDO    
-       
-    END SUBROUTINE flight_skip_var_list  
    
 !------------------------------------------------------------------------------!