Merge branch 'master' into Coal_jl2

dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py

@@ -81,7 +81,7 @@ myinterfield.forceCohesiveInsertionAllIPs(False,0.)
 
 # creation of Solver
 mysolver = nonLinearMechSolver(1000)
-mysolver.createModel(geofile,meshfile,3,2)
+mysolver.createModel(geofile,meshfile,3,1)
 mysolver.addDomain(myfieldEP)
 mysolver.addDomain(myfieldF)
 mysolver.addMaterialLaw(law1EP)
@@ -128,4 +128,4 @@ mysolver.archivingNodeDisplacement(86,0,1)
 mysolver.solve()
 
 check = TestCheck()
-check.equal(1.559224e-07,mysolver.getEnergy(3),2.e-3)
+check.equal(1.526738e-07,mysolver.getEnergy(3),2.e-3)

dG3D/benchmarks/conden_ldbc_DG/run.py

@@ -102,12 +102,14 @@ mysolver.solve()
 
 # test check
 check = TestCheck()
-check.equal(-1.043508e+02,mysolver.getHomogenizedStress(0,0),1.e-4)
-check.equal(6.15137E+02,mysolver.getHomogenizedStress(1,0),1.e-4)
-check.equal(1.90499E+03,mysolver.getHomogenizedStress(2,2),1.e-4)
 
-check.equal(8.322884e+04,mysolver.getHomogenizedTangent(0,0,0,0),1.e-4)
+check.equal(-1.033252e+02,mysolver.getHomogenizedStress(0,0),1.e-4)
+check.equal(6.149973e+02,mysolver.getHomogenizedStress(1,0),1.e-4)
+check.equal(1.905315e+03,mysolver.getHomogenizedStress(2,2),1.e-4)
+
+
+check.equal(8.328033e+04,mysolver.getHomogenizedTangent(0,0,0,0),1.e-4)
 check.equal(25140.8338148441,mysolver.getHomogenizedTangent(0,0,1,1),1.e-4)
-check.equal(3.075264e+04,mysolver.getHomogenizedTangent(0,1,0,1),1.e-4)
+check.equal(3.076014e+04,mysolver.getHomogenizedTangent(0,1,0,1),1.e-4)
 check.equal(146738.461976739,mysolver.getHomogenizedTangent(2,2,2,2),1.e-4)