Changeset 1779 for palm/trunk/SOURCE/init_grid.f90

Timestamp:

Mar 3, 2016 8:01:28 AM (8 years ago)

Author:

raasch

Message:

pmc array management changed from linked list to sequential loop; further small changes and cosmetics for the pmc

File:

• palm/trunk/SOURCE/init_grid.f90 (modified) (4 diffs)

palm/trunk/SOURCE/init_grid.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! coupling_char is trimmed at every place it occurs, because it can have
+! different length now
 !
 ! Former revisions:
@@ -89 +90 @@
 !
 ! 1069 2012-11-28 16:18:43Z maronga
-! bugfix: added coupling_char to TOPOGRAPHY_DATA to allow topography in the ocean
-!          model in case of coupled runs
+! bugfix: added coupling_char to TOPOGRAPHY_DATA to allow topography in the
+!         ocean model in case of coupled runs
 !
 ! 1036 2012-10-22 13:43:42Z raasch
@@ -680 +681 @@
 !--             Arbitrary irregular topography data in PALM format (exactly
 !--             matching the grid size and total domain size)
-                OPEN( 90, FILE='TOPOGRAPHY_DATA'//coupling_char, STATUS='OLD', &
-                      FORM='FORMATTED', ERR=10 )
+                OPEN( 90, FILE='TOPOGRAPHY_DATA'//TRIM( coupling_char ),       &
+                          STATUS='OLD', FORM='FORMATTED', ERR=10 )
                 DO  j = ny, 0, -1
                    READ( 90, *, ERR=11, END=11 )  ( topo_height(j,i), i = 0,nx )
@@ -688 +689 @@
                 GOTO 12
           
- 10             message_string = 'file TOPOGRAPHY'//coupling_char//' does not exist'
+ 10             message_string = 'file TOPOGRAPHY'//TRIM( coupling_char )//    &
+                                 ' does not exist'
                 CALL message( 'init_grid', 'PA0208', 1, 2, 0, 6, 0 )
 
- 11             message_string = 'errors in file TOPOGRAPHY_DATA'//coupling_char
+ 11             message_string = 'errors in file TOPOGRAPHY_DATA'//            &
+                                 TRIM( coupling_char )
                 CALL message( 'init_grid', 'PA0209', 1, 2, 0, 6, 0 )