From 2e66ed1b052b1068270ca089a9b63c0e0439a490 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 21 Dec 2017 11:35:48 +0100
Subject: [PATCH] Update the locking testsuite
---
locking_testsuite/deflection.plt | 22 +++++++-----
locking_testsuite/testsuite.sh | 57 ++++++++++++--------------------
2 files changed, 35 insertions(+), 44 deletions(-)
diff --git a/locking_testsuite/deflection.plt b/locking_testsuite/deflection.plt
index 4e0ed8f2..dafca5d1 100644
--- a/locking_testsuite/deflection.plt
+++ b/locking_testsuite/deflection.plt
@@ -1,18 +1,24 @@
set xlabel 'Refinement'
set ylabel 'Deflection'
+set key bottom
+
+# Tweak the aspect ratio a little
+set size 0.8,1
+
+# Plot only integral tics (the '1' is the increment between tics)
+set xtics 1
+
#set terminal postscript eps color "Arial,20" linewidth 6
set terminal pdf color linewidth 6
-set title 'Deflection of a cantilever beam'
+#set title 'Deflection'
set output "cantilever_deflection.pdf"
-plot 'average_deflection_3.8462e+05' using 1:4 with lines title "mu_c = mu", \
- 'average_deflection_0' using 1:4 with lines title "mu_c = 0"
-
-set title 'Lateral deflection of a cantilever beam'
-set output "cantilever_lateral_deflection.pdf"
+plot [][0:24] 'deflection.data' using 1:2 with linespoints title "1-1", \
+ 'deflection.data' using 1:3 with linespoints title "2-1", \
+ 'deflection.data' using 1:4 with linespoints title "2-2", \
+ 'deflection.data' using 1:5 with linespoints title "3-2", \
+ 'deflection.data' using 1:6 with linespoints title "3-3"
-plot 'average_deflection_3.8462e+05' using 1:3 with lines title "mu_c = mu", \
- 'average_deflection_0' using 1:3 with lines title "mu_c = 0"
diff --git a/locking_testsuite/testsuite.sh b/locking_testsuite/testsuite.sh
index c645ea0c..ea6ed618 100755
--- a/locking_testsuite/testsuite.sh
+++ b/locking_testsuite/testsuite.sh
@@ -5,12 +5,12 @@ set -e
runComputation(){
numLevels=$1
-mu_c=$2
-kappa=$3
+deformationOrder=$2
+rotationOrder=$3
#RESULTPATH=`pwd`/richards_surfacewater_results_${leakage}_${richardsonDamping}/
#LOGFILE=${RESULTPATH}/"richards_${mu_c}_${numLevels}.log"
-LOGFILE="./cosserat_continuum_${mu_c}_${numLevels}_${kappa}.log"
+LOGFILE="./cosserat_continuum_${deformationOrder}_${rotationOrder}_${numLevels}.log"
#echo $RESULTPATH
@@ -20,51 +20,36 @@ LOGFILE="./cosserat_continuum_${mu_c}_${numLevels}_${kappa}.log"
# fi
#rm $RESULTPATH/*
-#################################################
-# Make directories for the iterates
-#################################################
-# for i in $(eval echo "{0..$LASTTIMESTEP}"); do
-# ITERATESDIRNAME=${RESULTPATH}/iterates_$i
-# if ! test -d ${ITERATESDIRNAME}; then
-# mkdir ${ITERATESDIRNAME}
-# fi
-# done
-
#################################################
# run the actual simulation
#################################################
-../cosserat-continuum -numLevels ${numLevels} -materialParameters.mu_c ${mu_c} -materialParameters.kappa ${kappa} | tee ${LOGFILE}
-
-
-#################################################
-# Delete the directories for the iterates.
-# If we let the stay they eat up to much memory
-#################################################
+../build-cmake/src/cosserat-continuum-${deformationOrder}-${rotationOrder} cosserat-continuum-cantilever.parset -numLevels ${numLevels} | tee ${LOGFILE}
}
-MAXPROCS=4
+MAXPROCS=1
-for numLevels in 1 2 3 4 5; do
+for numLevels in 1 2 3 4; do
- #for mu_c in 3.8462e+05 0; do
- mu_c=0
+ for order in 3; do
- for kappa in 1 0.1 0.01; do
-
# Do one simulation run
- runComputation $numLevels $mu_c $kappa &
-
- # Never have more than MAXPROCS processes
- NPROC=$(($NPROC+1))
- if [ "$NPROC" -ge "$MAXPROCS" ]; then
- wait
- NPROC=0
- fi
-
- done
+ #runComputation $numLevels $order $order
+
+ #runComputation $numLevels 2 1
+
+ runComputation $numLevels 3 2
+
+ # Never have more than MAXPROCS processes
+ NPROC=$(($NPROC+1))
+ if [ "$NPROC" -ge "$MAXPROCS" ]; then
+ wait
+ NPROC=0
+ fi
+
+done
done
--
GitLab