From abebda688768b767610d764a3675f9efe8c21392 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 15:21:19 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/nonlinear_poisson_equation.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/nonlinear_poisson_equation.F90 b/src/fortran/nonlinear_poisson_equation.F90 index 57f67e1..b60d6b8 100644 --- a/src/fortran/nonlinear_poisson_equation.F90 +++ b/src/fortran/nonlinear_poisson_equation.F90 @@ -60,6 +60,7 @@ PROGRAM NONLINEAR_POISSON_EQUATION 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 @@ -142,8 +143,9 @@ PROGRAM NONLINEAR_POISSON_EQUATION CALL cmfe_OutputSetOn("nonlinear_poisson_equation",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) !----------------------------------------------------------------------------------------------------------- ! COORDINATE SYSTEM From 97e239c7756e431d52063f7a5f993b2cf61a7f59 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:52:14 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/nonlinear_poisson_equation.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/nonlinear_poisson_equation.F90 b/src/fortran/nonlinear_poisson_equation.F90 index b60d6b8..414efeb 100644 --- a/src/fortran/nonlinear_poisson_equation.F90 +++ b/src/fortran/nonlinear_poisson_equation.F90 @@ -60,7 +60,6 @@ PROGRAM NONLINEAR_POISSON_EQUATION 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 @@ -143,9 +142,8 @@ PROGRAM NONLINEAR_POISSON_EQUATION CALL cmfe_OutputSetOn("nonlinear_poisson_equation",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) !----------------------------------------------------------------------------------------------------------- ! COORDINATE SYSTEM