Changeset 2894 for palm/trunk/SOURCE/uv_exposure_model_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/uv_exposure_model_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/uv_exposure_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Routine for skipping global restart data has been removed, uvem_last_actions
+! has been renamed to uvem_wrd_global and uvem_read_restart_data has been 
+! renamed to uvem_rrd_global, 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, marker *** end new module *** has been
+! 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 
+! 
+! 2848 2018-03-05 10:11:18Z Giersch
 ! Initial revision
 !
@@ -199 +209 @@
 ! !
 ! !-- Writing of binary output for restart runs  !!! renaming?!
-!     INTERFACE uvem_last_actions
-!        MODULE PROCEDURE uvem_last_actions
-!     END INTERFACE uvem_last_actions
+!     INTERFACE uvem_wrd_global
+!        MODULE PROCEDURE uvem_wrd_global
+!     END INTERFACE uvem_wrd_global
 !     
 !
@@ -211 +221 @@
 ! !
 ! !-- Reading of parameters for restart runs
-!     INTERFACE uvem_read_restart_data
-!        MODULE PROCEDURE uvem_read_restart_data
-!     END INTERFACE uvem_read_restart_data
-! 
-! !
-! !-- Writing of parameters for restart runs !!! renaming?!
-!     INTERFACE uvem_skip_var_list
-!        MODULE PROCEDURE uvem_skip_var_list
-!     END INTERFACE uvem_skip_var_list
+!     INTERFACE uvem_rrd_global
+!        MODULE PROCEDURE uvem_rrd_global
+!     END INTERFACE uvem_rrd_global
 ! 
 ! !
@@ -860 +864 @@
 ! ! Description:
 ! ! ------------
-! !> This routine reads the respective restart data.
+! !> This routine reads the global restart data.
 ! !------------------------------------------------------------------------------!
-!  SUBROUTINE uvem_read_restart_data  
-! 
-!     
+!  SUBROUTINE uvem_rrd_global
+!
+!
+!     USE control_parameters,                                                    &
+!         ONLY: length, restart_string
+!
+!
 !     IMPLICIT NONE
-!        
-!     CHARACTER (LEN=30) ::  variable_chr  !< dummy variable to read string
+!
+!     LOGICAL, INTENT(OUT)  ::  found 
+!
+!
+!     found = .TRUE. 
 !        
 !        
-!     READ ( 13 )  variable_chr
-!     DO  WHILE ( TRIM( variable_chr ) /= '*** end new module ***' )
-! 
-!        SELECT CASE ( TRIM( variable_chr ) )
-!           
-! !           CASE ( 'param1' )
-! !              IF ( .NOT. ALLOCATED( param1 ) )  ALLOCATE( param1(...) )
-! !              READ ( 13 )  param1   
-!           
-!        END SELECT
-!           
-!        READ ( 13 )  variable_chr
-!           
-!     ENDDO
-! 
-!  END SUBROUTINE uvem_read_restart_data  
+!     SELECT CASE ( restart_string(1:length) )
+!
+!       CASE ( 'param1' )
+!          READ ( 13 )  param1
+!
+!        CASE DEFAULT
+!
+!          found = .FALSE.   
+!
+!     END SELECT
+! 
+!  END SUBROUTINE uvem_rrd_global  
     
 
@@ -891 +898 @@
 ! ! Description:
 ! ! ------------
-! !> This routine writes the respective restart data.
+! !> This routine writes the global restart data.
 ! !------------------------------------------------------------------------------!
-!  SUBROUTINE uvem_last_actions
-! 
+!  SUBROUTINE uvem_wrd_global
+! 
+!
 !     IMPLICIT NONE
+!
+!
+!     CALL wrd_write_string( 'param1' )
+!     WRITE ( 14 )  param1         
+! 
 !        
-! !      WRITE ( 14 )  'param1                            '
-! !      WRITE ( 14 )  param1       
-! 
 !        
-!     WRITE ( 14 )  '*** end new module ***            '
-!        
-!  END SUBROUTINE uvem_last_actions   
-
-
-! !------------------------------------------------------------------------------!
-! ! Description:
-! ! ------------
-! !> Skipping of parameters from restart file (binary format).
-! !------------------------------------------------------------------------------!
-!  SUBROUTINE uvem_skip_var_list  
-!            
-!     IMPLICIT NONE
-!        
-!     CHARACTER (LEN=1)  ::  param2         !<
-!     CHARACTER (LEN=30) ::  variable_chr   !<
-!        
-!     READ ( 13 )  variable_chr
-!     DO  WHILE ( TRIM( variable_chr ) /= '*** end new module ***' )
-!        READ ( 13 )  param2
-!     ENDDO    
-!        
-!  END SUBROUTINE uvem_skip_var_list 
+!  END SUBROUTINE uvem_wrd_global