From 3fa68fe351f7f240f78064b2bcc6399c4e105385 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 14:58:53 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/diffusion_equation.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/diffusion_equation.F90 b/src/fortran/diffusion_equation.F90 index d6e9823..adc951e 100644 --- a/src/fortran/diffusion_equation.F90 +++ b/src/fortran/diffusion_equation.F90 @@ -54,6 +54,7 @@ PROGRAM 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 @@ -99,8 +100,9 @@ PROGRAM DIFFUSION_EQUATION 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_GLOBAL_Y_ELEMENTS=10 From 61dab3b4deaac062e5631bc9da4eb957a88d88f7 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:42:42 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/diffusion_equation.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/diffusion_equation.F90 b/src/fortran/diffusion_equation.F90 index adc951e..d09ead6 100644 --- a/src/fortran/diffusion_equation.F90 +++ b/src/fortran/diffusion_equation.F90 @@ -54,7 +54,6 @@ PROGRAM 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 @@ -100,9 +99,8 @@ PROGRAM DIFFUSION_EQUATION 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_GLOBAL_Y_ELEMENTS=10