Commit 30e1c208 authored by Hamilton, Steven P.'s avatar Hamilton, Steven P.
Browse files

Minor updates to CPU scripts.

parent b58c02b0
Loading
Loading
Loading
Loading
+13 −2
Original line number Diff line number Diff line
@@ -28,6 +28,17 @@ RESULTSDIR="__resultsdir__"
UNIQUE_ID_STRING="__unique_id_string__"
INPUTDIR=${STARTINGDIRECTORY}/../Inputs

echo "EXECUTABLE"
echo ${EXECUTABLE}
echo "WORKDIR"
echo ${WORKDIR}
echo "RESULTSDIR"
echo ${RESULTSDIR}
echo "INPUTDIR"
echo ${INPUTDIR}
echo "STARTINGDIRECTORY"
echo ${STARTINGDIRECTORY}

#-----------------------------------------------------
# Ensure that we are in the correct starting         -
# directory.                                         -
@@ -69,7 +80,7 @@ ls -l
#                                                    -
#-----------------------------------------------------
echo "Contents of input directory:"
ls -l ${INPUTDIR}
ls -l ${INPUTDIR}/

ln -s ${INPUTDIR}/c5g7_3d_cpu_1node.xml .
ln -s ${INPUTDIR}/c5g7_252g.xml .
@@ -80,7 +91,7 @@ ln -s ${INPUTDIR}/c5g7_252g.xml .
#-----------------------------------------------------
log_binary_execution_time.py --scriptsdir $STARTINGDIRECTORY --uniqueid $UNIQUE_ID_STRING --mode start

mpirun --oversubscribe -np 20 packages/MC/xmc -i c5g7_3d_cpu_1node.xml
mpirun --oversubscribe -np 20 ${EXECUTABLE} -i c5g7_3d_cpu_1node.xml | tee stdout.txt

log_binary_execution_time.py --scriptsdir $STARTINGDIRECTORY --uniqueid $UNIQUE_ID_STRING --mode final

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ total_processes = 1
processes_per_node = 32
batchqueue = batch
walltime = 60
executablename = packages/MC/xmc
executablename = xmc
batchfilename = run_profugus.sh
buildscriptname = ./build_profugus.sh
checkscriptname = ./check_profugus.sh