From f07265d8f5ccf6560786117ec9a53f435cedadfd Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 10 Apr 2018 15:24:39 +1200 Subject: [PATCH 1/4] Update for new computation environment routines. --- src/fortran/stokes_ale.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/stokes_ale.F90 b/src/fortran/stokes_ale.F90 index 29d931b..6b104a7 100644 --- a/src/fortran/stokes_ale.F90 +++ b/src/fortran/stokes_ale.F90 @@ -130,6 +130,7 @@ PROGRAM stokes_ale TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion + TYPE(cmfe_ComputationEnvironmentType) :: computationEnvironment TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem TYPE(cmfe_BasisType) :: BasisGeometry @@ -188,8 +189,9 @@ PROGRAM stokes_ale !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 61d407dc917b8782b4876e6f21516ef2b4813a42 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Sun, 20 Jun 2021 16:13:13 +1200 Subject: [PATCH 2/4] Adding OPENCMISS_TOOLCHAIN --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c66e3ed..21d1b3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 3.4 FATAL_ERROR) +if (DEFINED OpenCMISSLibs_DIR) + set(CMAKE_PROJECT_INCLUDE_BEFORE ${OpenCMISSLibs_DIR}/opencmisslibs-preconfig.cmake) +endif () + project(Stokes_ALE VERSION 1.0 LANGUAGES C Fortran) find_package(OpenCMISSLibs 1.3.0 REQUIRED COMPONENTS Iron CONFIG) From 5125d76831ab8a813ba77d7486ecfbc1b7737a14 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Thu, 17 Nov 2022 12:12:58 +1300 Subject: [PATCH 3/4] Backup --- src/fortran/stokes_ale.F90 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fortran/stokes_ale.F90 b/src/fortran/stokes_ale.F90 index 6b104a7..7a24e25 100644 --- a/src/fortran/stokes_ale.F90 +++ b/src/fortran/stokes_ale.F90 @@ -19,6 +19,7 @@ PROGRAM stokes_ale REAL(CMISSRP), PARAMETER :: WIDTH=1.0_CMISSRP REAL(CMISSRP), PARAMETER :: LENGTH=1.0_CMISSRP + INTEGER(CMISSIntg), PARAMETER :: ContextUserNumber=1 INTEGER(CMISSIntg), PARAMETER :: CoordinateSystemUserNumber=1 INTEGER(CMISSIntg), PARAMETER :: RegionUserNumber=2 INTEGER(CMISSIntg), PARAMETER :: MeshUserNumber=3 From a49645a106d7e5497a3763ccbda52b8da6b48c29 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Fri, 17 Feb 2023 18:12:38 +1300 Subject: [PATCH 4/4] Latest version --- src/fortran/stokes_ale.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fortran/stokes_ale.F90 b/src/fortran/stokes_ale.F90 index 7a24e25..80f39a0 100644 --- a/src/fortran/stokes_ale.F90 +++ b/src/fortran/stokes_ale.F90 @@ -1,11 +1,13 @@ -PROGRAM stokes_ale +PROGRAM StokesALEExample USE OpenCMISS USE OpenCMISS_Iron #ifndef NOMPIMOD USE MPI #endif + IMPLICIT NONE + #ifdef NOMPIMOD #include "mpif.h" #endif @@ -888,4 +890,4 @@ PROGRAM stokes_ale WRITE(*,'(A)') "Program successfully completed." STOP -END PROGRAM stokes_ale +END PROGRAM StokesALEExample