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 f021dcce322fc3722c0d5ec2f15eb21d2719f38e Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Fri, 27 Apr 2018 20:21:26 +1200 Subject: [PATCH 2/2] Fixes for contexts. --- src/fortran/stokes_dynamic.F90 | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/fortran/stokes_dynamic.F90 b/src/fortran/stokes_dynamic.F90 index 5cead47..7687a7b 100644 --- a/src/fortran/stokes_dynamic.F90 +++ b/src/fortran/stokes_dynamic.F90 @@ -109,8 +109,8 @@ PROGRAM stokes_dynamic TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment + TYPE(cmfe_ContextType) :: context TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem - TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem TYPE(cmfe_BasisType) :: BasisGeometry TYPE(cmfe_BasisType) :: BasisVelocity TYPE(cmfe_BasisType) :: BasisPressure @@ -146,8 +146,11 @@ PROGRAM stokes_dynamic !INITIALISE OPENCMISS - CALL cmfe_Initialise(WorldCoordinateSystem,WorldRegion,Err) - CALL cmfe_ErrorHandlingModeSet(CMFE_ERRORS_TRAP_ERROR,Err) + CALL cmfe_Context_Initialise(context,err) + CALL cmfe_Initialise(context,err) + CALL cmfe_ErrorHandlingModeSet(CMFE_ERRORS_TRAP_ERROR,err) + CALL cmfe_Region_Initialise(worldRegion,err) + CALL cmfe_Context_WorldRegionGet(context,worldRegion,err) ! !================================================================================================================================ @@ -157,6 +160,7 @@ PROGRAM stokes_dynamic !Get the computational nodes information CALL cmfe_ComputationEnvironment_Initialise(computationEnvironment,err) + CALL cmfe_Context_ComputationEnvironmentGet(context,computationEnvironment,err) CALL cmfe_ComputationEnvironment_NumberOfWorldNodesGet(computationEnvironment,numberOfComputationalNodes,err) CALL cmfe_ComputationEnvironment_WorldNodeNumberGet(computationEnvironment,computationalNodeNumber,err) @@ -235,7 +239,7 @@ PROGRAM stokes_dynamic !Start the creation of a new RC coordinate system CALL cmfe_CoordinateSystem_Initialise(CoordinateSystem,Err) - CALL cmfe_CoordinateSystem_CreateStart(CoordinateSystemUserNumber,CoordinateSystem,Err) + CALL cmfe_CoordinateSystem_CreateStart(CoordinateSystemUserNumber,context,CoordinateSystem,Err) !Set the coordinate system dimension CALL cmfe_CoordinateSystem_DimensionSet(CoordinateSystem,NUMBER_OF_DIMENSIONS,Err) !Finish the creation of the coordinate system @@ -265,7 +269,7 @@ PROGRAM stokes_dynamic !Start the creation of new bases MESH_NUMBER_OF_COMPONENTS=1 CALL cmfe_Basis_Initialise(BasisGeometry,Err) - CALL cmfe_Basis_CreateStart(BASIS_NUMBER_SPACE,BasisGeometry,Err) + CALL cmfe_Basis_CreateStart(BASIS_NUMBER_SPACE,context,BasisGeometry,Err) !Set the basis type (Lagrange/Simplex) CALL cmfe_Basis_TypeSet(BasisGeometry,BASIS_TYPE,Err) !Set the basis xi number @@ -291,7 +295,7 @@ PROGRAM stokes_dynamic !Initialise a new velocity basis CALL cmfe_Basis_Initialise(BasisVelocity,Err) !Start the creation of a basis - CALL cmfe_Basis_CreateStart(BASIS_NUMBER_VELOCITY,BasisVelocity,Err) + CALL cmfe_Basis_CreateStart(BASIS_NUMBER_VELOCITY,context,BasisVelocity,Err) !Set the basis type (Lagrange/Simplex) CALL cmfe_Basis_TypeSet(BasisVelocity,BASIS_TYPE,Err) !Set the basis xi number @@ -320,7 +324,7 @@ PROGRAM stokes_dynamic !Initialise a new pressure basis CALL cmfe_Basis_Initialise(BasisPressure,Err) !Start the creation of a basis - CALL cmfe_Basis_CreateStart(BASIS_NUMBER_PRESSURE,BasisPressure,Err) + CALL cmfe_Basis_CreateStart(BASIS_NUMBER_PRESSURE,context,BasisPressure,Err) !Set the basis type (Lagrange/Simplex) CALL cmfe_Basis_TypeSet(BasisPressure,BASIS_TYPE,Err) !Set the basis xi number @@ -510,7 +514,7 @@ PROGRAM stokes_dynamic !Start the creation of a problem. CALL cmfe_Problem_Initialise(Problem,Err) CALL cmfe_ControlLoop_Initialise(ControlLoop,Err) - CALL cmfe_Problem_CreateStart(ProblemUserNumber,[CMFE_PROBLEM_FLUID_MECHANICS_CLASS,CMFE_PROBLEM_STOKES_EQUATION_TYPE, & + CALL cmfe_Problem_CreateStart(ProblemUserNumber,context,[CMFE_PROBLEM_FLUID_MECHANICS_CLASS,CMFE_PROBLEM_STOKES_EQUATION_TYPE, & & CMFE_PROBLEM_TRANSIENT_STOKES_SUBTYPE],Problem,Err) !Finish the creation of a problem. CALL cmfe_Problem_CreateFinish(Problem,Err) @@ -668,7 +672,7 @@ PROGRAM stokes_dynamic ENDIF !Finialise CMISS - CALL cmfe_Finalise(Err) + CALL cmfe_Finalise(context,Err) WRITE(*,'(A)') "Program successfully completed." STOP