From ec620bfc22cb574f27ac6e5a33d589fe02c22430 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 14:43:24 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/cellml_split_reaction_diffusion_equation.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/cellml_split_reaction_diffusion_equation.F90 b/src/fortran/cellml_split_reaction_diffusion_equation.F90 index 5999e6e..c746058 100644 --- a/src/fortran/cellml_split_reaction_diffusion_equation.F90 +++ b/src/fortran/cellml_split_reaction_diffusion_equation.F90 @@ -58,6 +58,7 @@ PROGRAM CELLML_SPLIT_REACTION_DIFFUSION_EQUATION !CMISS variables TYPE(cmfe_BasisType) :: Basis + TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem,WorldCoordinateSystem TYPE(cmfe_DecompositionType) :: Decomposition TYPE(cmfe_EquationsType) :: Equations @@ -110,8 +111,9 @@ PROGRAM CELLML_SPLIT_REACTION_DIFFUSION_EQUATION CALL cmfe_Initialise(WorldCoordinateSystem,WorldRegion,Err) CALL cmfe_ErrorHandlingModeSet(CMFE_ERRORS_TRAP_ERROR,Err) !Get the computational nodes information - CALL cmfe_ComputationalNumberOfNodesGet(NumberOfComputationalNodes,Err) - CALL cmfe_ComputationalNodeNumberGet(ComputationalNodeNumber,Err) + CALL cmfe_ComputationEnvironment_Initialise(computationEnvironment,err) + CALL cmfe_ComputationEnvironment_NumberOfWorldNodesGet(computationEnvironment,numberOfComputationalNodes,err) + CALL cmfe_ComputationEnvironment_WorldNodeNumberGet(computationEnvironment,computationalNodeNumber,err) NUMBER_GLOBAL_X_ELEMENTS=10 NUMBER_OF_DOMAINS=NumberOfComputationalNodes From 4fef0d69eb87899d6138a982e5ad923af31ee9b3 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:38:15 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/cellml_split_reaction_diffusion_equation.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/cellml_split_reaction_diffusion_equation.F90 b/src/fortran/cellml_split_reaction_diffusion_equation.F90 index c746058..8b3f0b3 100644 --- a/src/fortran/cellml_split_reaction_diffusion_equation.F90 +++ b/src/fortran/cellml_split_reaction_diffusion_equation.F90 @@ -58,7 +58,6 @@ PROGRAM CELLML_SPLIT_REACTION_DIFFUSION_EQUATION !CMISS variables TYPE(cmfe_BasisType) :: Basis - TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem,WorldCoordinateSystem TYPE(cmfe_DecompositionType) :: Decomposition TYPE(cmfe_EquationsType) :: Equations @@ -111,9 +110,8 @@ PROGRAM CELLML_SPLIT_REACTION_DIFFUSION_EQUATION CALL cmfe_Initialise(WorldCoordinateSystem,WorldRegion,Err) CALL cmfe_ErrorHandlingModeSet(CMFE_ERRORS_TRAP_ERROR,Err) !Get the computational nodes information - CALL cmfe_ComputationEnvironment_Initialise(computationEnvironment,err) - CALL cmfe_ComputationEnvironment_NumberOfWorldNodesGet(computationEnvironment,numberOfComputationalNodes,err) - CALL cmfe_ComputationEnvironment_WorldNodeNumberGet(computationEnvironment,computationalNodeNumber,err) + CALL cmfe_ComputationalNumberOfNodesGet(numberOfComputationalNodes,err) + CALL cmfe_ComputationalNodeNumberGet(computationalNodeNumber,err) NUMBER_GLOBAL_X_ELEMENTS=10 NUMBER_OF_DOMAINS=NumberOfComputationalNodes