From e5ec5ed54ca52d3d68c02cb0bae210078046d733 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 15 Oct 2018 05:03:53 +0200 Subject: [PATCH 1/3] check prerequisites as early as possible --- src/DAMASK_interface.f90 | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/DAMASK_interface.f90 b/src/DAMASK_interface.f90 index 3bd4df68f..a2b4f53f2 100644 --- a/src/DAMASK_interface.f90 +++ b/src/DAMASK_interface.f90 @@ -43,25 +43,42 @@ subroutine DAMASK_interface_init() use, intrinsic :: & iso_fortran_env #include +#if defined(__GFORTRAN__) && __GNUC__ < 5 +=================================================================================================== + 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 +=================================================================================================== +================== THIS VERSION OF DAMASK REQUIRES gfortran > 5.0 ============================== +====================== THIS VERSION OF DAMASK REQUIRES gfortran > 5.0 ========================== +========================= THIS VERSION OF DAMASK REQUIRES gfortran > 5.0 ======================= +=================================================================================================== + 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 5.0 +=================================================================================================== +#endif + +#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1600 +=================================================================================================== + 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 +=================================================================================================== +================== THIS VERSION OF DAMASK REQUIRES ifort > 16.0 ================================ +====================== THIS VERSION OF DAMASK REQUIRES ifort > 16.0 =========================== +========================= THIS VERSION OF DAMASK REQUIRES ifort > 16.0 ======================== +=================================================================================================== + 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 16.0 +=================================================================================================== +#endif + #if PETSC_VERSION_MAJOR!=3 || PETSC_VERSION_MINOR!=10 =================================================================================================== 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x =================================================================================================== -======= THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ========================================== -========== THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ======================================= -============= THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ==================================== -================ THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ================================= =================== THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ============================== ====================== THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x =========================== ========================= THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ======================== -============================ THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ===================== -=============================== THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ================== -================================== THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x =============== -===================================== THIS VERSION OF DAMASK REQUIRES PETSc 3.10.x ============ =================================================================================================== 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x 3.10.x =================================================================================================== #endif + use PETScSys use system_routines, only: & getHostName, & From e140b15bb85d39032931c536b60a2aee920b5d2c Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 15 Oct 2018 17:46:22 +0200 Subject: [PATCH 2/3] [skip ci] updated version information after successful test of v2.0.2-824-ge5ec5ed5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9fbc026c8..b22f156cf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-822-g3ed22eca +v2.0.2-824-ge5ec5ed5 From 50b03e03302e0cf9b194c5eb365cdbbc2de5cbd4 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 15 Oct 2018 22:05:44 +0200 Subject: [PATCH 3/3] was probably never used --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4149078d1..a8a7a6e0f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ SHELL = /bin/sh # Makefile for the installation of DAMASK ######################################################################################## .PHONY: all -all: spectral FEM marc processing +all: spectral FEM processing .PHONY: spectral spectral: build/spectral @@ -23,10 +23,6 @@ build/FEM: @mkdir -p build/FEM @(cd build/FEM; cmake -Wno-dev -DDAMASK_SOLVER=FEM -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) -.PHONY: marc -marc: - @./installation/mods_MarcMentat/apply_DAMASK_modifications.sh ${MAKEFLAGS} - .PHONY: clean clean: @rm -rf build