From 4a302933f39d7401c15b340f1f639a971a166632 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 15:26:41 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/stokes_static.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/stokes_static.F90 b/src/fortran/stokes_static.F90 index 7c3ed89..d6275b4 100644 --- a/src/fortran/stokes_static.F90 +++ b/src/fortran/stokes_static.F90 @@ -96,6 +96,7 @@ PROGRAM stokes_static TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion + TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem TYPE(cmfe_BasisType) :: BasisGeometry @@ -142,8 +143,9 @@ PROGRAM stokes_static !CHECK COMPUTATIONAL NODE !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) ! !================================================================================================================================ From 3aaa07e3cf3d257560ee132960642b81f11870cf Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:57:37 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/stokes_static.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/stokes_static.F90 b/src/fortran/stokes_static.F90 index d6275b4..c71e5d2 100644 --- a/src/fortran/stokes_static.F90 +++ b/src/fortran/stokes_static.F90 @@ -96,7 +96,6 @@ PROGRAM stokes_static TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion - TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem TYPE(cmfe_BasisType) :: BasisGeometry @@ -143,9 +142,8 @@ PROGRAM stokes_static !CHECK COMPUTATIONAL NODE !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) ! !================================================================================================================================