From b54742cfa7e783a2ac00ccc3195bf5d87f4bb148 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 15 Sep 2018 20:08:47 +0200 Subject: [PATCH 1/2] [skip sc] [skip ci] PETSc 3.10 is out --- src/DAMASK_interface.f90 | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/DAMASK_interface.f90 b/src/DAMASK_interface.f90 index 02a1ad1d8..8f0b5420d 100644 --- a/src/DAMASK_interface.f90 +++ b/src/DAMASK_interface.f90 @@ -43,24 +43,23 @@ subroutine DAMASK_interface_init() use, intrinsic :: & iso_fortran_env #include -#if PETSC_VERSION_MAJOR!=3 || PETSC_VERSION_MINOR!=9 +#if PETSC_VERSION_MAJOR!=3 || PETSC_VERSION_MINOR!=10 =================================================================================================== - 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.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 =================================================================================================== -======= THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x =========================================== -========== THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x ======================================== -============= THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x ===================================== -================ THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x ================================== -=================== THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x =============================== -====================== THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x ============================ -========================= THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x ========================= -============================ THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x ====================== -=============================== THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x =================== -================================== THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x ================ -===================================== THIS VERSION OF DAMASK REQUIRES PETSc 3.9.x ============= -======================================== THIS VERSION OF DAMASK REQUIRES PETSc 3.9.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.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.x 3.9.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 From ecf92c162587faaeaf79ddcc4da1ce798a68c333 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 18 Sep 2018 06:06:28 +0200 Subject: [PATCH 2/2] using new (not yet installed) PETSc version 3.10.0 for testing --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d65f53a7..ccc3480a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,11 +67,13 @@ variables: MPICH_GNU: "$MPICH3_2GNU7_3" MPICH_Intel: "$MPICH3_2Intel18_1" # ++++++++++++ PETSc +++++++++++++++++++++++++++++++++++++++++++++++++ + PETSc3_10_0MPICH3_2Intel18_1: "Libraries/PETSc/3.10.0/Intel-18.1-MPICH-3.2.1" + PETSc3_10_0MPICH3_2GNU7_3: "Libraries/PETSc/3.10.0/GNU-7.3-MPICH-3.2.1" PETSc3_9_1MPICH3_2Intel18_1: "Libraries/PETSc/3.9.1/Intel-18.1-MPICH-3.2.1" PETSc3_9_1MPICH3_2GNU7_3: "Libraries/PETSc/3.9.1/GNU-7.3-MPICH-3.2.1" # ------------ Defaults ---------------------------------------------- - PETSc_MPICH_Intel: "$PETSc3_9_1MPICH3_2Intel18_1" - PETSc_MPICH_GNU: "$PETSc3_9_1MPICH3_2GNU7_3" + PETSc_MPICH_Intel: "$PETSc3_10_0MPICH3_2Intel18_1" + PETSc_MPICH_GNU: "$PETSc3_10_0MPICH3_2GNU7_3" # ++++++++++++ FEM +++++++++++++++++++++++++++++++++++++++++++++++++++ Abaqus2017: "FEM/Abaqus/2017" MSC2017: "FEM/MSC/2017"