Changeset 221 for palm/trunk/SCRIPTS/mbuild

Timestamp:

Jan 12, 2009 3:32:23 PM (16 years ago)

Author:

raasch

Message:

new environment variable mpilib in configuration file, used by mrun, mbuild, and subjob; small bugfix concerning t<0 in init_cloud_physics

File:

• palm/trunk/SCRIPTS/mbuild (modified) (3 diffs)

palm/trunk/SCRIPTS/mbuild

@@ -798 +798 @@
 
 
+       # MPI LIBRARY ERMITTELN
+    line=""
+    found=false
+    grep  "$remote_host_string" $config_file | grep "%mpilib"  >  $tmp_mbuild
+    while read line1
+    do
+
+       if [[ $(echo $line1 | cut -d" " -s -f3-) = "$remote_host_string" ]]
+       then
+          line="$line1"
+       fi
+
+       if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" ]]
+       then
+             # EVENTUELLE DOPPELPUNKTE AUS DIREKTIVENSTRING ENTFERNEN
+          mpilib=`echo $line | cut -d" " -s -f2`
+          found=true
+       fi
+
+    done < $tmp_mbuild
+
+    [[ $found = false ]]  &&  mpilib=mpt
+
+
+
+
        # LADER-OPTIONEN ERMITTELN
     line=""
@@ -887 +913 @@
        line=$(echo "$line" | cut -c51-)
     done
+    if [[ $( echo $remote_host | cut -c1-5 ) = lcsgi ]]
+    then
+       column1="mpi library:"; column2=$mpilib
+       printf "| $column1$column2 | \n"
+    fi
     column1="loader options:"; column2=$loader_options
     printf "| $column1$column2 | \n"
@@ -1082 +1113 @@
              then
 
-                print ". /usr/share/modules/init/bash; module load mpt/1.21; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
+                print ". /usr/share/modules/init/bash; module load $mpilib; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
 #                print ". /usr/share/modules/init/bash; module load mvapich2/1.2rc1-intel; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
 #                print ". /usr/share/modules/init/bash; module load mvapich2; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll