From ab3c90bea250300a973747a71f71ffa667f3fd94 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 14:29:42 +1200 Subject: [PATCH 1/3] Update for new computation environment routines. --- src/fortran/burgers_dynamic.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/burgers_dynamic.F90 b/src/fortran/burgers_dynamic.F90 index 37cdc58..1357a8e 100644 --- a/src/fortran/burgers_dynamic.F90 +++ b/src/fortran/burgers_dynamic.F90 @@ -64,6 +64,7 @@ PROGRAM burgers_dynamic !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 @@ -89,8 +90,9 @@ PROGRAM burgers_dynamic 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 544ee2b3289a8adb2d205dd4ea95e0f8632af52a Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Wed, 11 Apr 2018 11:22:40 +1200 Subject: [PATCH 2/3] Update for new computational environment setup --- src/fortran/burgers_dynamic.F90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fortran/burgers_dynamic.F90 b/src/fortran/burgers_dynamic.F90 index 1357a8e..b5eb4d5 100644 --- a/src/fortran/burgers_dynamic.F90 +++ b/src/fortran/burgers_dynamic.F90 @@ -90,9 +90,9 @@ PROGRAM burgers_dynamic 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_ComputationEnvironment_Initialise(computationEnvironment,err) + CALL cmfe_ComputationEnvironment_NumberOfWorldNodesGet(computationEnvironment,numberOfComputationalNodes,err) + CALL cmfe_ComputationEnvironment_WorldNodeNumberGet(computationEnvironment,computationalNodeNumber,err) !----------------------------------------------------------------------------------------------------------- ! PROBLEM CONTROL PANEL From a4d2dfd12bca2def6b079cffc0b8dba3c5c64c76 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:28:47 +1200 Subject: [PATCH 3/3] Back to working with develop --- src/fortran/burgers_dynamic.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/burgers_dynamic.F90 b/src/fortran/burgers_dynamic.F90 index c74aa60..fe30699 100644 --- a/src/fortran/burgers_dynamic.F90 +++ b/src/fortran/burgers_dynamic.F90 @@ -64,7 +64,6 @@ PROGRAM burgers_dynamic !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 @@ -89,9 +88,8 @@ PROGRAM burgers_dynamic 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