Merge pull request #2 from chrispbradley/develop

Update for merge

Author: chrispbradley

src/python/dof_constraints.py

@@ -162,6 +162,9 @@
 problem.SolverGet([iron.ControlLoopIdentifiers.NODE], 1, nonLinearSolver)
 nonLinearSolver.outputType = iron.SolverOutputTypes.PROGRESS
 nonLinearSolver.NewtonJacobianCalculationTypeSet(iron.JacobianCalculationTypes.FD)
+nonLinearSolver.NewtonAbsoluteToleranceSet(1e-14)
+nonLinearSolver.NewtonSolutionToleranceSet(1e-14)
+nonLinearSolver.NewtonRelativeToleranceSet(1e-14)
 nonLinearSolver.NewtonLinearSolverGet(linearSolver)
 linearSolver.linearType = iron.LinearSolverTypes.DIRECT
 problem.SolversCreateFinish()
@@ -216,10 +219,9 @@
 # Solve the problem
 problem.Solve()
 
-if not os.path.exists("./results"):
-    os.makedirs("./results")
-
 # Export results
+if not os.path.exists('./results'):
+    os.makedirs('./results')
 fields = iron.Fields()
 fields.CreateRegion(region)
 fields.NodesExport("./results/Cantilever", "FORTRAN")

src/python/expected_results/Cantilever.part0.exelem renamed to src/python/expected_results/results/Cantilever.part0.exelem

@@ -265,8 +265,8 @@
      2.0000000000000000E+00
      1.0000000000000000E+00
      8.9999999999999998E-04
-     -2.1950386260517363E-01
-     5.5546902189007596E-08
+     -2.1950384114688470E-01
+     -9.9653618690354051E-13
      0.0000000000000000E+00
      0.0000000000000000E+00
      -9.8100000000000005E+00
@@ -279,8 +279,8 @@
      2.0000000000000000E+00
      1.0000000000000000E+00
      8.9999999999999998E-04
-     1.4670178093238712E-01
-     1.7388089190717437E-08
+     1.4670178832402728E-01
+     2.1671553440683056E-12
      0.0000000000000000E+00
      0.0000000000000000E+00
      -9.8100000000000005E+00
@@ -293,8 +293,8 @@
      2.0000000000000000E+00
      1.0000000000000000E+00
      8.9999999999999998E-04
-     -2.1950196292028593E-01
-     5.8741681741025786E-08
+     -2.1950194154756292E-01
+     2.8297364451645990E-12
      0.0000000000000000E+00
      0.0000000000000000E+00
      -9.8100000000000005E+00
@@ -307,8 +307,8 @@
      2.0000000000000000E+00
      1.0000000000000000E+00
      8.9999999999999998E-04
-     1.4668093545033564E-01
-     1.1645525432868453E-08
+     1.4668094382937771E-01
+     1.1617373729677638E-12
      0.0000000000000000E+00
      0.0000000000000000E+00
      -9.8100000000000005E+00
@@ -321,8 +321,8 @@
      2.0000000000000000E+00
      1.0000000000000000E+00
      8.9999999999999998E-04
-     2.4655303134640730E-01
-     3.8760818998895274E-08
+     2.4655299796392760E-01
+     6.6213701188644336E-13
      0.0000000000000000E+00
      0.0000000000000000E+00
      -9.8100000000000005E+00
@@ -335,8 +335,8 @@
      2.0000000000000000E+00
      1.0000000000000000E+00
      8.9999999999999998E-04
-     -1.4298081571297214E-01
-     8.9158866956040583E-09
+     -1.4298077477648827E-01
+     2.0285995105950860E-12
      0.0000000000000000E+00
      0.0000000000000000E+00
      -9.8100000000000005E+00
@@ -349,8 +349,8 @@
      2.0000000000000000E+00
      1.0000000000000000E+00
      8.9999999999999998E-04
-     2.4656334168127192E-01
-     3.9549687969042679E-08
+     2.4656330771970897E-01
+     -5.0714987764877151E-13
      0.0000000000000000E+00
      0.0000000000000000E+00
      -9.8100000000000005E+00
@@ -363,8 +363,8 @@
      2.0000000000000000E+00
      1.0000000000000000E+00
      8.9999999999999998E-04
-     -1.4300692500472759E-01
-     6.0242122401632514E-09
+     -1.4300688277747234E-01
+     6.9277916736609768E-13
      0.0000000000000000E+00
      0.0000000000000000E+00
      -9.8100000000000005E+00