Changeset 220 for palm/trunk/SOURCE

Timestamp:

Dec 18, 2008 7:00:36 AM (16 years ago)

Author:

raasch

Message:

some small bugfixes in user_module, user_read_restart_data, read_3d_binary, flow_statistics and mrun

Location:

palm/trunk/SOURCE

Files:

• flow_statistics.f90 (modified) (1 diff)
• read_3d_binary.f90 (modified) (1 diff)
• user_module.f90 (modified) (1 diff)
• user_read_restart_data.f90 (modified) (2 diffs)

palm/trunk/SOURCE/flow_statistics.f90

@@ -1008 +1008 @@
        ts_value(19,sr) = hom(nzb+1,1,pr_palm,sr)    ! u'w'    at k=0
        ts_value(20,sr) = hom(nzb+2,1,pr_palm,sr)    ! v'w'    at k=0
-       ts_value(21,sr) = hom(nzb+12,1,pr_palm,sr)   ! w'q'    at k=0
+       ts_value(21,sr) = hom(nzb+12,1,pr_palm,sr)   ! q*
 
        IF ( ts_value(5,sr) /= 0.0 )  THEN

palm/trunk/SOURCE/read_3d_binary.f90

@@ -974 +974 @@
 !
 !--    Read user-defined restart data
-       CALL user_read_restart_data( nxlfa, nxl_on_file, nxrfa, nxr_on_file, &
-                                    nynfa, nyn_on_file, nysfa, nys_on_file, &
-                                    offset_xa, offset_ya, overlap_count(i), &
+       CALL user_read_restart_data( i, nxlfa, nxl_on_file, nxrfa, nxr_on_file, &
+                                    nynfa, nyn_on_file, nysfa, nys_on_file,    &
+                                    offset_xa, offset_ya, overlap_count(i),    &
                                     tmp_2d, tmp_3d )
 

palm/trunk/SOURCE/user_module.f90

@@ -37 +37 @@
     INTEGER ::  dots_num_palm, user_idummy
     LOGICAL ::  user_defined_namelist_found = .FALSE.
-    REAL    ::  user_dummy
+    REAL    ::  user_rdummy
 
 !

palm/trunk/SOURCE/user_read_restart_data.f90

@@ -1 @@
- SUBROUTINE user_read_restart_data( nxlfa, nxl_on_file, nxrfa, nxr_on_file, &
-                                    nynfa, nyn_on_file, nysfa, nys_on_file, &
-                                    offset_xa, offset_ya, overlap_count,    &
+ SUBROUTINE user_read_restart_data( i, nxlfa, nxl_on_file, nxrfa, nxr_on_file, &
+                                    nynfa, nyn_on_file, nysfa, nys_on_file,    &
+                                    offset_xa, offset_ya, overlap_count,       &
                                     tmp_2d, tmp_3d )
 
@@ -33 +33 @@
     CHARACTER (LEN=20) :: field_char
 
-    INTEGER ::  k, nxlc, nxlf, nxl_on_file, nxrc, nxrf, nxr_on_file, nync, &
+    INTEGER ::  i, k, nxlc, nxlf, nxl_on_file, nxrc, nxrf, nxr_on_file, nync, &
                 nynf, nyn_on_file, nysc, nysf, nys_on_file, overlap_count