From 3b893fcf02fcb6c279057e241b17c1c59e84d521 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 15:25:35 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/stokes_dynamic.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/stokes_dynamic.F90 b/src/fortran/stokes_dynamic.F90 index 1f7f565..5cead47 100644 --- a/src/fortran/stokes_dynamic.F90 +++ b/src/fortran/stokes_dynamic.F90 @@ -108,6 +108,7 @@ PROGRAM stokes_dynamic TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion + TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem TYPE(cmfe_BasisType) :: BasisGeometry @@ -155,8 +156,9 @@ PROGRAM stokes_dynamic !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 bdbc7be7f644f24fc97327a89f9fa30b6080dcba Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:56:04 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/stokes_dynamic.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/stokes_dynamic.F90 b/src/fortran/stokes_dynamic.F90 index 5cead47..39af311 100644 --- a/src/fortran/stokes_dynamic.F90 +++ b/src/fortran/stokes_dynamic.F90 @@ -108,7 +108,6 @@ PROGRAM stokes_dynamic TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion - TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem TYPE(cmfe_BasisType) :: BasisGeometry @@ -156,9 +155,8 @@ PROGRAM stokes_dynamic !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) ! !================================================================================================================================