From 3be56ab1758e1ed24741b99a0d9ccfb34e708828 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 14:33:15 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/burgers_static.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/burgers_static.F90 b/src/fortran/burgers_static.F90 index 76f1a0b..83ab006 100644 --- a/src/fortran/burgers_static.F90 +++ b/src/fortran/burgers_static.F90 @@ -58,6 +58,7 @@ PROGRAM burgers_static !Program types 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 burgers_static CALL cmfe_Initialise(WorldCoordinateSystem,WorldRegion,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) !----------------------------------------------------------------------------------------------------------- ! PROBLEM CONTROL PANEL From 3f13b897aacf537ab4808b931c27979c948ddbdd Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:34:43 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/burgers_static.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/burgers_static.F90 b/src/fortran/burgers_static.F90 index 83ab006..3b60293 100644 --- a/src/fortran/burgers_static.F90 +++ b/src/fortran/burgers_static.F90 @@ -58,7 +58,6 @@ PROGRAM burgers_static !Program types 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 burgers_static CALL cmfe_Initialise(WorldCoordinateSystem,WorldRegion,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) !----------------------------------------------------------------------------------------------------------- ! PROBLEM CONTROL PANEL