From 9fae2a9c62e6e4cae4e215dff6b5d138c2e7e724 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 14:41:44 +1200 Subject: [PATCH 1/3] Update for new computation environment routines. --- src/python/cellml_growth_law.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/python/cellml_growth_law.py b/src/python/cellml_growth_law.py index d896d3c..28d5c7d 100644 --- a/src/python/cellml_growth_law.py +++ b/src/python/cellml_growth_law.py @@ -91,8 +91,9 @@ iron.DiagnosticsSetOn(iron.DiagnosticTypes.FROM,[1,2,3,4,5],"Diagnostics",["FiniteElasticity_FiniteElementResidualEvaluate"]) # Get the number of computational nodes and this computational node number -numberOfComputationalNodes = iron.ComputationalNumberOfNodesGet() -computationalNodeNumber = iron.ComputationalNodeNumberGet() +computationEnvironment = iron.ComputationEnvironment() +numberOfComputationalNodes = computationEnvironment.NumberOfWorldNodesGet() +computationalNodeNumber = computationEnvironment.WorldNodeNumberGet() # Create a 3D rectangular cartesian coordinate system coordinateSystem = iron.CoordinateSystem() From aea8b4ad6332081d8299c7a89d156f0af5ff3be4 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 19:35:35 +1200 Subject: [PATCH 2/3] Back to working with develop --- src/python/cellml_growth_law.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/python/cellml_growth_law.py b/src/python/cellml_growth_law.py index 28d5c7d..d896d3c 100644 --- a/src/python/cellml_growth_law.py +++ b/src/python/cellml_growth_law.py @@ -91,9 +91,8 @@ iron.DiagnosticsSetOn(iron.DiagnosticTypes.FROM,[1,2,3,4,5],"Diagnostics",["FiniteElasticity_FiniteElementResidualEvaluate"]) # Get the number of computational nodes and this computational node number -computationEnvironment = iron.ComputationEnvironment() -numberOfComputationalNodes = computationEnvironment.NumberOfWorldNodesGet() -computationalNodeNumber = computationEnvironment.WorldNodeNumberGet() +numberOfComputationalNodes = iron.ComputationalNumberOfNodesGet() +computationalNodeNumber = iron.ComputationalNodeNumberGet() # Create a 3D rectangular cartesian coordinate system coordinateSystem = iron.CoordinateSystem() From 56f438012323b4e754a58a431ad70839ff20a89c Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 20:05:27 +1200 Subject: [PATCH 3/3] Turn off diagnostics temporarily for python 3 --- src/python/cellml_growth_law.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/cellml_growth_law.py b/src/python/cellml_growth_law.py index d896d3c..bf19aa3 100644 --- a/src/python/cellml_growth_law.py +++ b/src/python/cellml_growth_law.py @@ -88,7 +88,7 @@ InterpolationType = 1 -iron.DiagnosticsSetOn(iron.DiagnosticTypes.FROM,[1,2,3,4,5],"Diagnostics",["FiniteElasticity_FiniteElementResidualEvaluate"]) +#iron.DiagnosticsSetOn(iron.DiagnosticTypes.FROM,[1,2,3,4,5],"Diagnostics",["FiniteElasticity_FiniteElementResidualEvaluate"]) # Get the number of computational nodes and this computational node number numberOfComputationalNodes = iron.ComputationalNumberOfNodesGet()