From 4cd7b401adb315dfe7480dd18cd0a522450a1f8b Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 15:15:11 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/python/monodomain_2D_HH.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/python/monodomain_2D_HH.py b/src/python/monodomain_2D_HH.py index d5da69d..d2d85c5 100644 --- a/src/python/monodomain_2D_HH.py +++ b/src/python/monodomain_2D_HH.py @@ -59,8 +59,9 @@ #DOC-START parallel information # 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() #DOC-END parallel information #DOC-START initialisation From 87998fd1dfded472fc217fbb3ee9b09ef0a0a9f5 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Fri, 27 Apr 2018 20:15:21 +1200 Subject: [PATCH 2/2] Fixes for contexts. --- src/python/monodomain_2D_HH.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/python/monodomain_2D_HH.py b/src/python/monodomain_2D_HH.py index d2d85c5..cb4dc6c 100644 --- a/src/python/monodomain_2D_HH.py +++ b/src/python/monodomain_2D_HH.py @@ -57,9 +57,13 @@ cellMLParametersFieldUserNumber = 8 cellMLIntermediateFieldUserNumber = 9 +worldRegion = iron.Region() +iron.Context.WorldRegionGet(worldRegion) + #DOC-START parallel information # Get the number of computational nodes and this computational node number computationEnvironment = iron.ComputationEnvironment() +iron.Context.ComputationEnvironmentGet(computationEnvironment) numberOfComputationalNodes = computationEnvironment.NumberOfWorldNodesGet() computationalNodeNumber = computationEnvironment.WorldNodeNumberGet() #DOC-END parallel information @@ -67,13 +71,13 @@ #DOC-START initialisation # Create a 2D rectangular cartesian coordinate system coordinateSystem = iron.CoordinateSystem() -coordinateSystem.CreateStart(coordinateSystemUserNumber) +coordinateSystem.CreateStart(coordinateSystemUserNumber,iron.Context) coordinateSystem.DimensionSet(2) coordinateSystem.CreateFinish() # Create a region and assign the coordinate system to the region region = iron.Region() -region.CreateStart(regionUserNumber,iron.WorldRegion) +region.CreateStart(regionUserNumber,worldRegion) region.LabelSet("Region") region.coordinateSystem = coordinateSystem region.CreateFinish() @@ -82,7 +86,7 @@ #DOC-START basis # Define a bilinear Lagrange basis basis = iron.Basis() -basis.CreateStart(basisUserNumber) +basis.CreateStart(basisUserNumber,iron.Context) basis.type = iron.BasisTypes.LAGRANGE_HERMITE_TP basis.numberOfXi = 2 basis.interpolationXi = [iron.BasisInterpolationSpecifications.LINEAR_LAGRANGE]*2 @@ -258,7 +262,7 @@ problemSpecification = [iron.ProblemClasses.BIOELECTRICS, iron.ProblemTypes.MONODOMAIN_EQUATION, iron.ProblemSubtypes.MONODOMAIN_GUDUNOV_SPLIT] -problem.CreateStart(problemUserNumber, problemSpecification) +problem.CreateStart(problemUserNumber,iron.Context,problemSpecification) problem.CreateFinish() #DOC-END define monodomain problem