From 8283f8dd15d794c30da670fe9a6a4cc8e1c2e370 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 14:57:39 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/darcy_static.F90 | 6 ++++-- src/python/darcy_static.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/fortran/darcy_static.F90 b/src/fortran/darcy_static.F90 index 8dbe8f8..20b6341 100644 --- a/src/fortran/darcy_static.F90 +++ b/src/fortran/darcy_static.F90 @@ -92,6 +92,7 @@ PROGRAM darcy_static !CMISS variables TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion + TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem TYPE(cmfe_BasisType) :: BasisGeometry @@ -126,8 +127,9 @@ PROGRAM darcy_static CALL cmfe_ErrorHandlingModeSet(CMFE_ERRORS_TRAP_ERROR,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 diff --git a/src/python/darcy_static.py b/src/python/darcy_static.py index badd8c5..2347ef8 100644 --- a/src/python/darcy_static.py +++ b/src/python/darcy_static.py @@ -40,8 +40,9 @@ # DIAGNOSTICS AND COMPUTATIONAL NODE INFORMATION #----------------------------------------------------------------------------------------------------------- -numberOfComputationalNodes = iron.ComputationalNumberOfNodesGet() -computationalNodeNumber = iron.ComputationalNodeNumberGet() +computationEnvironment = iron.ComputationEnvironment() +numberOfComputationalNodes = computationEnvironment.NumberOfWorldNodesGet() +computationalNodeNumber = computationEnvironment.WorldNodeNumberGet() #----------------------------------------------------------------------------------------------------------- #COORDINATE SYSTEM From 5780a999876687de3874561ef1f94ec9a9444188 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:40:14 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/darcy_static.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/darcy_static.F90 b/src/fortran/darcy_static.F90 index 20b6341..49df4c9 100644 --- a/src/fortran/darcy_static.F90 +++ b/src/fortran/darcy_static.F90 @@ -92,7 +92,6 @@ PROGRAM darcy_static !CMISS variables TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion - TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem TYPE(cmfe_BasisType) :: BasisGeometry @@ -127,9 +126,8 @@ PROGRAM darcy_static CALL cmfe_ErrorHandlingModeSet(CMFE_ERRORS_TRAP_ERROR,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