Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deal.II scripts #166

Merged
merged 9 commits into from
Mar 23, 2021
Merged

Update deal.II scripts #166

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b3c9f9
Update script and merged parameter files for deal.II
davidscn Mar 18, 2021
ed5f7f5
Apply suggestions from code review
davidscn Mar 21, 2021
9675bca
Update parameter files
davidscn Mar 21, 2021
b97c859
Remove duplicated parameter file
davidscn Mar 21, 2021
3d1f49e
Update run scripts
davidscn Mar 21, 2021
4d7b928
Update last run.sh script
davidscn Mar 21, 2021
cb2c7aa
Fix typos in parameter files
davidscn Mar 22, 2021
e3161c8
Update multiple-perpendicular-flaps/solid-right-dealii/parameters.prm
uekerman Mar 23, 2021
e580529
Add comment on linear residual in parameter file
davidscn Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 0 additions & 71 deletions multiple-perpendicular-flaps/solid-left-dealii/linear_elasticity.prm
View file
Open in desktop

This file was deleted.

40 changes: 18 additions & 22 deletions ...olid-left-dealii/nonlinear_elasticity.prm → ...ar-flaps/solid-left-dealii/parameters.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,50 @@ subsection Time
# Time step size
set Time step size = 0.01

# Output interval
set Output interval = 10
# Write results every x timesteps
set Output interval = 10
end

subsection Discretization
# Newmark beta
set beta = 0.25

# Newmark gamma
set gamma = 0.5

# Polynomial degree of the FE system
set Polynomial degree = 4
end

subsection System properties
# Poisson's ratio
set Poisson's ratio = 0.375
set Poisson's ratio = 0.3

# Shear modulus
set Shear modulus = 153846
set Shear modulus = 1538462

# Density
set rho = 3000
set rho = 3000

# Body forces x,y,z
set body forces = 0.0,0.0,0.0
end

subsection Linear solver
# Linear solver iterations (multiples of the system matrix size)
set Max iteration multiplier = 1

# Linear solver residual (scaled by residual norm)
set Residual = 1e-6
subsection Solver
# Structural model to be used: linear or neo-Hookean
set Model = linear

# Linear solver: CG or Direct
set Solver type = Direct
end

subsection Nonlinear solver
# Number of Newton-Raphson iterations allowed
# Max CG solver iterations (multiples of the system matrix size)
# In 2-d, this value is best set at 2. In 3-d, a value of 1 work fine.
set Max iteration multiplier = 1

# Absolute CG solver residual (multiplied by residual norm, ignored if Model == linear)
set Residual = 1e-6

# Number of Newton-Raphson iterations allowed (ignored if Model == linear)
set Max iterations Newton-Raphson = 10

# Displacement error tolerance
# Relative displacement error tolerance for non-linear iteration (ignored if Model == linear)
set Tolerance displacement = 1.0e-6

# Force residual tolerance
# Relative force residual tolerance for non-linear iteration (ignored if Model == linear)
set Tolerance force = 1.0e-9
end

Expand Down
39 changes: 21 additions & 18 deletions multiple-perpendicular-flaps/solid-left-dealii/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
#!/bin/bash
cd ${0%/*} || exit 1 # Run from this directory

# Solid1 participant
# Solid participant

# Run this script in one terminal and the execute the Fluid participant
# and the Solid2 participant in another terminal.
# These scripts present how the three participants would be started manually.
# in another terminal.
# These scripts present how the two participants would be started manually.

# 1 for true, 0 for false
nonlinear=0
if [ "$1" = "-nonlinear" ]; then
nonlinear=1
fi
for i in "$@"
do
case $i in
-p=*|--prefix=*)
SEARCHPATH="${i#*=}"
shift # past argument=value
;;
*)
# unknown option
;;
esac
done

linear=0
if [ "$1" = "-linear" ]; then
linear=1
if test -f "elasticity"; then
./elasticity parameters.prm
elif [ ! -z ${SEARCHPATH} ]; then
${SEARCHPATH}/elasticity parameters.prm
else
echo "Unable to find the executable 'elasticity'. Either specify a prefix (-p=/path/to/elasticity) or make it discoverable at runtime (e.g. export PATH)"
fi

if [ $linear -eq 1 ]; then
./linear_elasticity linear_elasticity.prm
elif [ $nonlinear -eq 1 ]; then
./nonlinear_elasticity nonlinear_elasticity.prm
else
echo "No solver type specified. Please specify -linear or -nonlinear as solver type"
fi
71 changes: 0 additions & 71 deletions multiple-perpendicular-flaps/solid-right-dealii/linear_elasticity.prm
View file
Open in desktop

This file was deleted.

40 changes: 18 additions & 22 deletions ...lid-right-dealii/nonlinear_elasticity.prm → ...r-flaps/solid-right-dealii/parameters.prm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,50 @@ subsection Time
# Time step size
set Time step size = 0.01

# Output interval
set Output interval = 10
# Write results every x timesteps
set Output interval = 10
end

subsection Discretization
# Newmark beta
set beta = 0.25

# Newmark gamma
set gamma = 0.5

# Polynomial degree of the FE system
set Polynomial degree = 4
end

subsection System properties
# Poisson's ratio
set Poisson's ratio = 0.375
set Poisson's ratio = 0.3

# Shear modulus
set Shear modulus = 153846
set Shear modulus = 1538462

# Density
set rho = 3000
set rho = 3000

# Body forces x,y,z
set body forces = 0.0,0.0,0.0
end

subsection Linear solver
# Linear solver iterations (multiples of the system matrix size)
set Max iteration multiplier = 1

# Linear solver residual (scaled by residual norm)
set Residual = 1e-6
subsection Solver
# Structural model to be used: linear or neo-Hookean
set Model = linear

# Linear solver: CG or Direct
set Solver type = Direct
end

subsection Nonlinear solver
# Number of Newton-Raphson iterations allowed
# Max CG solver iterations (multiples of the system matrix size)
# In 2-d, this value is best set at 2. In 3-d, a value of 1 work fine.
davidscn marked this conversation as resolved.
Show resolved Hide resolved
set Max iteration multiplier = 1

# Absolute CG solver residual (multiplied by residual norm, ignored if Model == linear)
uekerman marked this conversation as resolved.
Show resolved Hide resolved
set Residual = 1e-6

# Number of Newton-Raphson iterations allowed (ignored if Model == linear)
set Max iterations Newton-Raphson = 10

# Displacement error tolerance
# Relative displacement error tolerance for non-linear iteration (ignored if Model == linear)
set Tolerance displacement = 1.0e-6

# Force residual tolerance
# Relative force residual tolerance for non-linear iteration (ignored if Model == linear)
set Tolerance force = 1.0e-9
end

Expand Down
39 changes: 21 additions & 18 deletions multiple-perpendicular-flaps/solid-right-dealii/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
#!/bin/bash
cd ${0%/*} || exit 1 # Run from this directory

# Solid2 participant
# Solid participant

# Run this script in one terminal and the execute the Fluid participant
# and the Solid1 participant in another terminal.
# These scripts present how the three participants would be started manually.
# in another terminal.
# These scripts present how the two participants would be started manually.

# 1 for true, 0 for false
nonlinear=0
if [ "$1" = "-nonlinear" ]; then
nonlinear=1
fi
for i in "$@"
do
case $i in
-p=*|--prefix=*)
SEARCHPATH="${i#*=}"
shift # past argument=value
;;
*)
# unknown option
;;
esac
done

linear=0
if [ "$1" = "-linear" ]; then
linear=1
if test -f "elasticity"; then
./elasticity parameters.prm
elif [ ! -z ${SEARCHPATH} ]; then
${SEARCHPATH}/elasticity parameters.prm
else
echo "Unable to find the executable 'elasticity'. Either specify a prefix (-p=/path/to/elasticity) or make it discoverable at runtime (e.g. export PATH)"
fi

if [ $linear -eq 1 ]; then
./linear_elasticity linear_elasticity.prm
elif [ $nonlinear -eq 1 ]; then
./nonlinear_elasticity nonlinear_elasticity.prm
else
echo "No solver type specified. Please specify -linear or -nonlinear as solver type"
fi
Loading