Changeset 1069 for palm/trunk

Timestamp:

Nov 28, 2012 4:18:43 PM (12 years ago)

Author:

maronga

Message:

allow usage of topography in combination with cloud physics, allow usage of topography in coupled ocean model, minor changes in mbuild and mrun

Location:

palm/trunk

Files:

• SCRIPTS/mbuild (modified) (2 diffs)
• SCRIPTS/mrun (modified) (4 diffs)
• SOURCE/check_parameters.f90 (modified) (2 diffs)
• SOURCE/init_grid.f90 (modified) (3 diffs)

palm/trunk/SCRIPTS/mbuild

@@ -20 +20 @@
 # Current revisions:
 # -----------------
+# added copy of nc2vdf tools to remote host
+#
 #
 # Former revisions:
@@ -1284 +1286 @@
                 # KOENNEN DOLLAR-ZEICHEN NICHT BENUTZT WERDEN
              remote_ud=`echo $remote_ud | sed 's/\$HOME\///'`
-             /bin/scp  batch_scp mbuild mrun process_dvr_output .dvrserver.config subjob  ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
-          else
-             scp  batch_scp mbuild mrun process_dvr_output .dvrserver.config subjob  ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
+             /bin/scp  batch_scp mbuild mrun process_dvr_output .dvrserver.config subjob batch_nc2vdf nc2vdf nc2vdf.ncl nc2vdf.config ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
+          else
+             scp  batch_scp mbuild mrun process_dvr_output .dvrserver.config subjob batch_nc2vdf nc2vdf nc2vdf.ncl nc2vdf.config ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
           fi
 

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # -----------------
-# 
+# bugfix: coupling mode was always set to mpi2, typos removed
+
 #
 # Former revisions:
@@ -559 +560 @@
     while read line
     do
-       if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" &&  ( $(echo $line | cut -d" " -s -f4) = $cond1 || $(echo $line | cut -d" " -s -f4)  = $cond2 ) ]]
+       if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" &&  $(echo $line | cut -d" " -s -f4) = $cond1 && $(echo $line | cut -d" " -s -f4)  = $cond2 ]]
        then
           coupled_mode="mpi2"
@@ -2240 +2241 @@
  then
     skip_check=true
-    reason="restart run.)"
+    reason="restart run."
  fi 
 
@@ -2426 +2427 @@
              locat=normal; exit
           else
-             printf "\n  *** Skipping parameter file check."
+             printf "\n  *** skipping parameter file check."
          
           fi

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
+! allow usage of topography in combination with cloud physics
 !
 ! Former revisions:
@@ -558 +559 @@
           WRITE( action, '(A)' )  'galilei_transformation = .TRUE.'
        ENDIF
-       IF ( cloud_physics )  THEN
-          WRITE( action, '(A)' )  'cloud_physics = .TRUE.'
-       ENDIF
        IF ( cloud_droplets )  THEN
-          WRITE( action, '(A)' )  'cloud_droplets = .TRUE.'
+          WRITE( action, '(A)' )  'cloud_droplets = .TRUE. (has not been tested)'
        ENDIF
        IF ( .NOT. prandtl_layer )  THEN

palm/trunk/SOURCE/init_grid.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! bugfix: added coupling_char to TOPOGRAPHY_DATA to allow topography in the ocean
+!          model in case of coupled runs
 !
 ! Former revisions:
@@ -587 +588 @@
 !--             Arbitrary irregular topography data in PALM format (exactly
 !--             matching the grid size and total domain size)
-                OPEN( 90, FILE='TOPOGRAPHY_DATA', STATUS='OLD', &
+                OPEN( 90, FILE='TOPOGRAPHY_DATA'//coupling_char, STATUS='OLD', &
                       FORM='FORMATTED', ERR=10 )
                 DO  j = ny, 0, -1
@@ -595 +596 @@
                 GOTO 12
           
- 10             message_string = 'file TOPOGRAPHY_DATA does not exist'
+ 10             message_string = 'file TOPOGRAPHY'//coupling_char//' does not exist'
                 CALL message( 'init_grid', 'PA0208', 1, 2, 0, 6, 0 )
 
- 11             message_string = 'errors in file TOPOGRAPHY_DATA'
+ 11             message_string = 'errors in file TOPOGRAPHY_DATA'//coupling_char
                 CALL message( 'init_grid', 'PA0209', 1, 2, 0, 6, 0 )