Changeset 2894 for palm/trunk/SOURCE/virtual_flight_mod.f90

Timestamp:

Mar 15, 2018 9:17:58 AM (6 years ago)

Author:

Giersch

Message:

Reading/Writing? data in case of restart runs revised

File:

• palm/trunk/SOURCE/virtual_flight_mod.f90 (modified) (8 diffs)

palm/trunk/SOURCE/virtual_flight_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! variable named found has been introduced for checking if restart data was 
+! found, reading of restart strings has been moved completely to 
+! read_restart_data_mod, virtual_flight_prerun flag has been removed, redundant
+! skipping function has been removed, flight_read/write_restart_data 
+! have been renamed to flight_r/wrd_global, flight_rrd_global is called in 
+! read_restart_data_mod now, marker *** end flight *** was removed, strings and
+! their respective lengths are written out and read now in case of restart runs
+! to get rid of prescribed character lengths, CASE DEFAULT was added if restart
+! data is read
+! 
+! 2872 2018-03-12 10:05:47Z Giersch
 ! virutal_flight_prerun flag is used to define if module 
 ! related parameters were outputted as restart data
@@ -66 +77 @@
  
     USE control_parameters,                                                    &
-        ONLY:  fl_max, num_leg, num_var_fl, num_var_fl_user, virtual_flight,   &
-               virtual_flight_prerun
+        ONLY:  fl_max, num_leg, num_var_fl, num_var_fl_user, virtual_flight
  
     USE kinds
@@ -134 +144 @@
        MODULE PROCEDURE flight_measurement
     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
-    END INTERFACE flight_read_restart_data
-    
-    INTERFACE flight_write_restart_data 
-       MODULE PROCEDURE flight_write_restart_data 
-    END INTERFACE flight_write_restart_data 
+    
+    INTERFACE flight_rrd_global 
+       MODULE PROCEDURE flight_rrd_global
+    END INTERFACE flight_rrd_global
+    
+    INTERFACE flight_wrd_global 
+       MODULE PROCEDURE flight_wrd_global 
+    END INTERFACE flight_wrd_global 
 
 !
@@ -153 +159 @@
 !-- Public interfaces
     PUBLIC flight_init, flight_header, flight_parin, flight_measurement,       &
-           flight_write_restart_data, flight_skip_var_list                    
+           flight_wrd_global, flight_rrd_global                   
 !
 !-- Public variables
@@ -238 +244 @@
        virtual_flight = .TRUE.
 
-       IF ( TRIM( initializing_actions ) == 'read_restart_data' ) THEN
-          CALL flight_read_restart_data
-       ENDIF
 
  10    CONTINUE
@@ -879 +882 @@
 
     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 
-        
-   
+
 !------------------------------------------------------------------------------!
 ! Description:
@@ -909 +889 @@
 !> This routine reads the respective restart data.
 !------------------------------------------------------------------------------!
-    SUBROUTINE flight_read_restart_data  
+    SUBROUTINE flight_rrd_global( found )  
+
+
+       USE control_parameters,                                                 &
+           ONLY: length, restart_string
 
     
        IMPLICIT NONE
        
-       CHARACTER (LEN=30) ::  variable_chr !< dummy variable to read string
-       
-       
-       READ ( 13 )  variable_chr
-       DO  WHILE ( TRIM( variable_chr ) /= '*** end flight ***' )
-
-          SELECT CASE ( TRIM( variable_chr ) )
+       LOGICAL, INTENT(OUT)  ::  found 
+
+
+       found = .TRUE.
+
+
+       SELECT CASE ( restart_string(1:length) )
           
-             CASE ( 'u_agl' )
-                IF ( .NOT. ALLOCATED( u_agl ) )  ALLOCATE( u_agl(1:num_leg) )
-                READ ( 13 )  u_agl   
-             CASE ( 'v_agl' )
-                IF ( .NOT. ALLOCATED( v_agl ) )  ALLOCATE( v_agl(1:num_leg) )
-                READ ( 13 )  v_agl
-             CASE ( 'w_agl' )
-                IF ( .NOT. ALLOCATED( w_agl ) )  ALLOCATE( w_agl(1:num_leg) )
-                READ ( 13 )  w_agl
-             CASE ( 'x_pos' )
-                IF ( .NOT. ALLOCATED( x_pos ) )  ALLOCATE( x_pos(1:num_leg) )
-                READ ( 13 )  x_pos
-             CASE ( 'y_pos' )
-                IF ( .NOT. ALLOCATED( y_pos ) )  ALLOCATE( y_pos(1:num_leg) )
-                READ ( 13 )  y_pos
-             CASE ( 'z_pos' )
-                IF ( .NOT. ALLOCATED( z_pos ) )  ALLOCATE( z_pos(1:num_leg) )
-                READ ( 13 )  z_pos
-             CASE ( 'virtual_flight_prerun' )
-                READ ( 13 )  virtual_flight_prerun
+          CASE ( 'u_agl' )
+             IF ( .NOT. ALLOCATED( u_agl ) )  ALLOCATE( u_agl(1:num_leg) )
+             READ ( 13 )  u_agl   
+          CASE ( 'v_agl' )
+             IF ( .NOT. ALLOCATED( v_agl ) )  ALLOCATE( v_agl(1:num_leg) )
+             READ ( 13 )  v_agl
+          CASE ( 'w_agl' )
+             IF ( .NOT. ALLOCATED( w_agl ) )  ALLOCATE( w_agl(1:num_leg) )
+             READ ( 13 )  w_agl
+          CASE ( 'x_pos' )
+             IF ( .NOT. ALLOCATED( x_pos ) )  ALLOCATE( x_pos(1:num_leg) )
+             READ ( 13 )  x_pos
+          CASE ( 'y_pos' )
+             IF ( .NOT. ALLOCATED( y_pos ) )  ALLOCATE( y_pos(1:num_leg) )
+             READ ( 13 )  y_pos
+          CASE ( 'z_pos' )
+             IF ( .NOT. ALLOCATED( z_pos ) )  ALLOCATE( z_pos(1:num_leg) )
+             READ ( 13 )  z_pos
+
+          CASE DEFAULT
+
+             found = .FALSE.
           
-          END SELECT
-          
-          READ ( 13 )  variable_chr
-          
-       ENDDO
-
-    END SUBROUTINE flight_read_restart_data  
+       END SELECT
+
+
+    END SUBROUTINE flight_rrd_global  
     
 !------------------------------------------------------------------------------!
@@ -956 +939 @@
 !> This routine writes the respective restart data.
 !------------------------------------------------------------------------------!
-    SUBROUTINE flight_write_restart_data  
+    SUBROUTINE flight_wrd_global  
+
 
        IMPLICIT NONE
 
-       virtual_flight_prerun = .TRUE.
-       
-       WRITE ( 14 )  'u_agl                         '
-       WRITE ( 14 )  u_agl       
-       WRITE ( 14 )  'v_agl                         '
+ 
+       CALL wrd_write_string( 'u_agl' )
+       WRITE ( 14 )  u_agl
+
+       CALL wrd_write_string( 'v_agl' )
        WRITE ( 14 )  v_agl
-       WRITE ( 14 )  'w_agl                         '
+
+       CALL wrd_write_string( 'w_agl' )
        WRITE ( 14 )  w_agl
-       WRITE ( 14 )  'x_pos                         '
+
+       CALL wrd_write_string( 'x_pos' )
        WRITE ( 14 )  x_pos
-       WRITE ( 14 )  'y_pos                         '
+
+       CALL wrd_write_string( 'y_pos' )
        WRITE ( 14 )  y_pos
-       WRITE ( 14 )  'z_pos                         '
+
+       CALL wrd_write_string( 'z_pos' )
        WRITE ( 14 )  z_pos
-       WRITE ( 14 )  'virtual_flight_prerun         '
-       WRITE ( 14 )  virtual_flight_prerun
-       
-       WRITE ( 14 )  '*** end flight ***            '
-       
-    END SUBROUTINE flight_write_restart_data    
+
+       
+    END SUBROUTINE flight_wrd_global