From 5e86b83c720281e9cce623a2df3f7cffca5b3d19 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 15:00:06 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/diffusion_equation_with_linear_source.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/diffusion_equation_with_linear_source.F90 b/src/fortran/diffusion_equation_with_linear_source.F90 index eafe71f..ca0a5d2 100644 --- a/src/fortran/diffusion_equation_with_linear_source.F90 +++ b/src/fortran/diffusion_equation_with_linear_source.F90 @@ -42,6 +42,7 @@ PROGRAM DiffusionEquationWithLinearSource !CMISS variables TYPE(cmfe_BasisType) :: basis TYPE(cmfe_BoundaryConditionsType) :: boundaryConditions + TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: coordinateSystem,worldCoordinateSystem TYPE(cmfe_DecompositionType) :: decomposition TYPE(cmfe_EquationsType) :: equations @@ -83,8 +84,9 @@ PROGRAM DiffusionEquationWithLinearSource CALL cmfe_RandomSeedsSet(9999,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) !Set output on CALL cmfe_OutputSetOn("DiffusionWithLinearSource",err) From c727283a1a5b19602949c5263cdb86cae54bf9d4 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:44:06 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/diffusion_equation_with_linear_source.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/diffusion_equation_with_linear_source.F90 b/src/fortran/diffusion_equation_with_linear_source.F90 index ca0a5d2..eafe71f 100644 --- a/src/fortran/diffusion_equation_with_linear_source.F90 +++ b/src/fortran/diffusion_equation_with_linear_source.F90 @@ -42,7 +42,6 @@ PROGRAM DiffusionEquationWithLinearSource !CMISS variables TYPE(cmfe_BasisType) :: basis TYPE(cmfe_BoundaryConditionsType) :: boundaryConditions - TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: coordinateSystem,worldCoordinateSystem TYPE(cmfe_DecompositionType) :: decomposition TYPE(cmfe_EquationsType) :: equations @@ -84,9 +83,8 @@ PROGRAM DiffusionEquationWithLinearSource CALL cmfe_RandomSeedsSet(9999,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) !Set output on CALL cmfe_OutputSetOn("DiffusionWithLinearSource",err)