From 9aa3a12aa9198e5f8b1bbc308123c1ee1b5aa070 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 14:39:04 +1200 Subject: [PATCH 1/2] Update for new computation environment routines. --- src/fortran/cantilever.F90 | 6 ++++-- src/python/cantilever.py | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/fortran/cantilever.F90 b/src/fortran/cantilever.F90 index 949f418..5ef8f9f 100644 --- a/src/fortran/cantilever.F90 +++ b/src/fortran/cantilever.F90 @@ -60,6 +60,7 @@ PROGRAM CANTILEVEREXAMPLE !CMISS variables TYPE(cmfe_BasisType) :: DisplacementBasis,PressureBasis TYPE(cmfe_BoundaryConditionsType) :: BoundaryConditions + TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem, WorldCoordinateSystem TYPE(cmfe_MeshType) :: Mesh TYPE(cmfe_DecompositionType) :: Decomposition @@ -163,8 +164,9 @@ PROGRAM CANTILEVEREXAMPLE WRITE(*,'("Scaling type: ", i3)') ScalingType !Get the number of computational nodes and this computational node number - 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) NumberOfDomains=NumberOfComputationalNodes diff --git a/src/python/cantilever.py b/src/python/cantilever.py index bdcf7e1..c5bf187 100644 --- a/src/python/cantilever.py +++ b/src/python/cantilever.py @@ -45,8 +45,9 @@ numberOfXi = 3 # Get the number of computational nodes and this computational node number -numberOfComputationalNodes = iron.ComputationalNumberOfNodesGet() -computationalNodeNumber = iron.ComputationalNodeNumberGet() +computationEnvironment = iron.ComputationEnvironment() +numberOfComputationalNodes = computationEnvironment.NumberOfWorldNodesGet() +computationalNodeNumber = computationEnvironment.WorldNodeNumberGet() # Create a 3D rectangular cartesian coordinate system coordinateSystem = iron.CoordinateSystem() @@ -240,7 +241,7 @@ linearSolver = iron.Solver() problem.SolversCreateStart() problem.SolverGet([iron.ControlLoopIdentifiers.NODE],1,nonLinearSolver) -nonLinearSolver.outputType = iron.SolverOutputTypes.PROGRESS +nonLinearSolver.outputType = iron.SolverOutputTypes.MONITOR nonLinearSolver.NewtonJacobianCalculationTypeSet(iron.JacobianCalculationTypes.FD) nonLinearSolver.NewtonAbsoluteToleranceSet(1e-14) nonLinearSolver.NewtonSolutionToleranceSet(1e-14) From 42ab686cae009ad181a32a9822a1d2579ea3e5a1 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sat, 15 Sep 2018 18:36:57 +1200 Subject: [PATCH 2/2] Back to working with develop --- src/fortran/cantilever.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fortran/cantilever.F90 b/src/fortran/cantilever.F90 index 5ef8f9f..6aa042a 100644 --- a/src/fortran/cantilever.F90 +++ b/src/fortran/cantilever.F90 @@ -60,7 +60,6 @@ PROGRAM CANTILEVEREXAMPLE !CMISS variables TYPE(cmfe_BasisType) :: DisplacementBasis,PressureBasis TYPE(cmfe_BoundaryConditionsType) :: BoundaryConditions - TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem, WorldCoordinateSystem TYPE(cmfe_MeshType) :: Mesh TYPE(cmfe_DecompositionType) :: Decomposition @@ -164,9 +163,8 @@ PROGRAM CANTILEVEREXAMPLE WRITE(*,'("Scaling type: ", i3)') ScalingType !Get the number of computational nodes and this computational node number - 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) NumberOfDomains=NumberOfComputationalNodes