Merge pull request #56 from M3Group/devel

Devel
MatMechLab · Feb 12, 2022 · 2a55333 · 2a55333
2 parents 9bbb257 + 3e279f8
commit 2a55333
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 12 deletions.
diff --git a/examples/logo/logo-ch.i b/examples/logo/logo-ch.i
@@ -58,7 +58,7 @@ name=c mu
 
 [nonlinearsolver]
   type=nr
-  solver=superlu
+  //solver=superlu
 [end]
 
 [ics]

diff --git a/examples/mechanics/saintvenant-2d.i b/examples/mechanics/saintvenant-2d.i
@@ -53,7 +53,7 @@ name=ux uy
   maxiters=25
   r_rel_tol=1.0e-12
   r_abs_tol=4.0e-7
-  solver=superlu
+  //solver=superlu
 [end]
 
 [timestepping]

diff --git a/examples/pffracture/ac-neohookean-shear.i b/examples/pffracture/ac-neohookean-shear.i
@@ -30,6 +30,7 @@ name=d ux uy
   r_rel_tol=5.0e-10
   r_abs_tol=5.5e-7
   //solver=superlu
+  //solver=cg
 [end]
 
 [ics]

diff --git a/examples/pffracture/ac-neohookean-tensile.i b/examples/pffracture/ac-neohookean-tensile.i
@@ -30,6 +30,7 @@ name=d ux uy
   r_rel_tol=1.0e-10
   r_abs_tol=5.5e-7
   //solver=superlu
+  //solver=cg
 [end]
 
 [ics]

diff --git a/examples/pffracture/asymnotch.i b/examples/pffracture/asymnotch.i
@@ -29,7 +29,7 @@ name=d ux uy
   maxiters=80
   r_rel_tol=5.0e-10
   r_abs_tol=2.5e-7
-  solver=mumps
+  //solver=mumps
 [end]
 
 [ics]

diff --git a/examples/pffracture/asymnotch2.i b/examples/pffracture/asymnotch2.i
@@ -29,7 +29,6 @@ name=d ux uy
   maxiters=80
   r_rel_tol=5.0e-10
   r_abs_tol=2.5e-7
-  solver=mumps
 [end]
 
 [ics]

diff --git a/examples/pffracture/grains100.i b/examples/pffracture/grains100.i
@@ -13,7 +13,7 @@ name=d ux uy
   maxiters=20
   r_rel_tol=5.0e-10
   r_abs_tol=5.5e-7
-  solver=superlu
+  //solver=superlu
 [end]
 
 [ics]

diff --git a/examples/pffracture/holes2d.i b/examples/pffracture/holes2d.i
@@ -29,7 +29,7 @@ name=d ux uy
   maxiters=20
   r_rel_tol=1.0e-10
   r_abs_tol=5.5e-7
-  solver=superlu
+  //solver=superlu
 [end]
 
 [ics]

diff --git a/examples/pffracture/miehe-shear.i b/examples/pffracture/miehe-shear.i
@@ -29,7 +29,7 @@ name=d ux uy
   maxiters=20
   r_rel_tol=5.0e-10
   r_abs_tol=1.5e-7
-  solver=superlu
+  //solver=superlu
 [end]
 
 [ics]

diff --git a/examples/tutorial/step5-dw.i b/examples/tutorial/step5-dw.i
@@ -40,7 +40,8 @@ name=c mu
 
 [nonlinearsolver]
   type=nr
-  solver=superlu
+  //solver=cg
+  //solver=superlu
 [end]
 
 [ics]

diff --git a/examples/tutorial/step5.i b/examples/tutorial/step5.i
@@ -40,7 +40,8 @@ name=c mu
 
 [nonlinearsolver]
   type=nr
-  solver=superlu
+  //solver=cg
+  //solver=superlu
 [end]
 
 [ics]

diff --git a/examples/tutorial/step6-3d.i b/examples/tutorial/step6-3d.i
@@ -55,7 +55,8 @@ rank2mate=stress strain
   maxiters=20
   r_rel_tol=5.0e-8
   r_abs_tol=4.5e-7
-  solver=mumps
+  //solver=cg
+  //solver=mumps
 [end]
 
 [timestepping]

diff --git a/examples/tutorial/step6.i b/examples/tutorial/step6.i
@@ -54,7 +54,8 @@ rank4mate=jacobian
   maxiters=20
   r_rel_tol=5.0e-8
   r_abs_tol=4.5e-7
-  solver=mumps
+  //solver=cg
+  //solver=mumps
 [end]
 
 [job]

diff --git a/examples/tutorial/step8.i b/examples/tutorial/step8.i
@@ -0,0 +1,53 @@
+[mesh]
+  type=asfem
+  dim=2
+  xmax=5
+  ymax=1
+  nx=100
+  ny=20
+  meshtype=quad9
+[end]
+
+[dofs]
+name=T
+[end]
+
+[elmts]
+  [mythermal]
+    type=user1
+    dofs=T
+    mate=mymate
+  [end]
+[end]
+
+[mates]
+  [mymate]
+    type=user2
+    params=1.0 2.0 0.05 1.0
+    //     rho Cp  K    Q
+  [end]
+[end]
+
+[bcs]
+  [flux]
+    type=neumann
+    dofs=T
+    value=-0.01
+    boundary=right
+  [end]
+[end]
+
+
+[timestepping]
+  type=be
+  dt=1.0e-5
+  dtmax=0.1
+  time=1.0e-1
+  adaptive=true
+  optiters=3
+[end]
+
+[job]
+  type=transient
+  debug=dep
+[end]
diff --git a/src/MateSystem/User1Material.cpp b/src/MateSystem/User1Material.cpp
@@ -19,7 +19,7 @@ void User1Material::InitMaterialProperties(const vector<double> &InputParams, co
     //*** get rid of unused warning
     //***************************************************
     if(InputParams.size()||elmtinfo.dt||elmtsoln.gpU[0]||Mate.GetScalarMate().size()){}
-
+    Mate.Rank2Materials("stress").SetToZeros();
 }
 
 //********************************************************************