From 1d936fc5f2acf0c64cf53f56ce03ba52feb77528 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 24 Nov 2018 09:53:18 +0100 Subject: [PATCH 01/13] simple variable rename causes problem with GCC 7.3 probalby a compiler bug --- src/material.f90 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/material.f90 b/src/material.f90 index 47b42efa5..c9dd28079 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -387,9 +387,8 @@ subroutine material_init() i, & !< integration point number e !< element number integer(pInt), dimension(:), allocatable :: & - PhaseCounter, & - CrystalliteCounter, & - HomogenizationCounter + CounterPhase, & + CounterHomogenization myDebug = debug_level(debug_material) @@ -488,20 +487,20 @@ subroutine material_init() ! END DEPRECATED allocate(material_homogenizationAt,source=mesh_homogenizationAt) - allocate(PhaseCounter (size(config_phase)), source=0_pInt) - allocate(HomogenizationCounter(size(config_homogenization)),source=0_pInt) + allocate(CounterPhase (size(config_phase)), source=0_pInt) + allocate(CounterHomogenization(size(config_homogenization)),source=0_pInt) ! BEGIN DEPRECATED do e = 1_pInt,mesh_NcpElems myHomog = mesh_homogenizationAt(e) do i = 1_pInt, mesh_NipsPerElem - HomogenizationCounter(myHomog) = HomogenizationCounter(myHomog) + 1_pInt - mappingHomogenization(1:2,i,e) = [HomogenizationCounter(myHomog),myHomog] + CounterHomogenization(myHomog) = CounterHomogenization(myHomog) + 1_pInt + mappingHomogenization(1:2,i,e) = [CounterHomogenization(myHomog),myHomog] do g = 1_pInt,homogenization_Ngrains(myHomog) myPhase = material_phase(g,i,e) - PhaseCounter(myPhase) = PhaseCounter(myPhase)+1_pInt ! not distinguishing between instances of same phase + CounterPhase(myPhase) = CounterPhase(myPhase)+1_pInt ! not distinguishing between instances of same phase phaseAt(g,i,e) = myPhase - phasememberAt(g,i,e) = PhaseCounter(myPhase) + phasememberAt(g,i,e) = CounterPhase(myPhase) enddo enddo enddo From 7c1e2e256c4cb588d2e9a48f844a09d7ff185748 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 24 Nov 2018 10:07:47 +0100 Subject: [PATCH 02/13] os.urandom returns byte, not string in python3 --- processing/pre/seeds_fromRandom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processing/pre/seeds_fromRandom.py b/processing/pre/seeds_fromRandom.py index c1a7cbd4d..6ec221e25 100755 --- a/processing/pre/seeds_fromRandom.py +++ b/processing/pre/seeds_fromRandom.py @@ -127,7 +127,7 @@ options.fraction = np.array(options.fraction) options.grid = np.array(options.grid) gridSize = options.grid.prod() -if options.randomSeed is None: options.randomSeed = int(os.urandom(4).encode('hex'), 16) +if options.randomSeed is None: options.randomSeed = int(os.urandom(4).hex(), 16) np.random.seed(options.randomSeed) # init random generators random.seed(options.randomSeed) From c317ea95ed2017f9609bf100c2afb8d5bfdf1eab Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 24 Nov 2018 10:08:42 +0100 Subject: [PATCH 03/13] averageDown was not tested but works with python3 --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6950d4c38..7af6f6139 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,6 +151,13 @@ Spectral_geometryPacking: - release ################################################################################################### +Post_AverageDown: + stage: postprocessing + script: averageDown/test.py + except: + - master + - release + Post_General: stage: postprocessing script: PostProcessing/test.py From 53eab5e3cfad7432a5da56995d173aa2ba8b2f79 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 24 Nov 2018 10:45:49 +0100 Subject: [PATCH 04/13] using updated tests --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index dd70ef078..8b171cf15 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit dd70ef078e0b4422b4bf81030e896a7bd098e841 +Subproject commit 8b171cf15da322c5cd1943144a0f511d56e42fa2 From c9714233c1ac4604d63d01e3895304e74c6474b2 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 24 Nov 2018 14:47:24 +0100 Subject: [PATCH 05/13] [skip ci] updated version information after successful test of v2.0.2-970-g1d936fc5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 38c9df1d3..d1e776990 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-961-gc0ad4967 +v2.0.2-970-g1d936fc5 From 497287d90db0d113f16704d593a013f9efce4956 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 24 Nov 2018 15:01:28 +0100 Subject: [PATCH 06/13] [skip ci] first look for gmake, then for make allows to compile on systems where GNU make (gmake) is not the default. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f742034e2..3aa49cd7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ linker: # CMake will execute each target in the ${petsc_config_makefile} # to acquire corresponding PETSc Variables. -find_program (MAKE_EXECUTABLE NAMES make gmake) +find_program (MAKE_EXECUTABLE NAMES gmake make) # Find the PETSc includes directory settings execute_process (COMMAND ${MAKE_EXECUTABLE} --no-print-directory -f ${petsc_config_makefile} "includes" RESULT_VARIABLE PETSC_INCLUDES_RETURN From 4e6f82f01f4a438d5c69971b12e451b2029df470 Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 25 Nov 2018 01:16:15 +0100 Subject: [PATCH 07/13] [skip ci] updated version information after successful test of v2.0.2-976-gde4873e9 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d1e776990..7664f22a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-970-g1d936fc5 +v2.0.2-976-gde4873e9 From f57c982ac7a0dbf4a565e1cd48727c061ac84465 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 25 Nov 2018 10:34:42 +0100 Subject: [PATCH 08/13] tests for thermal and orientation conversion orientation conversion need further investigation --- .gitlab-ci.yml | 14 ++++++++++++++ PRIVATE | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7af6f6139..06f4356b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -200,6 +200,13 @@ Post_ParaviewRelated: - master - release +Post_OrientationConversion: + stage: postprocessing + script: OrientationConversion/test.py + except: + - master + - release + ################################################################################################### Compile_Spectral_Intel: stage: compilePETScIntel @@ -250,6 +257,13 @@ Compile_Intel_Prepare: - release ################################################################################################### +Thermal: + stage: spectral + script: Thermal/test.py + except: + - master + - release + Spectral_PackedGeometry: stage: spectral script: Spectral_PackedGeometry/test.py diff --git a/PRIVATE b/PRIVATE index 8b171cf15..f3f684258 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 8b171cf15da322c5cd1943144a0f511d56e42fa2 +Subproject commit f3f68425831d9b84906448861077f27cffe37e57 From 5290a9ac83d049e29585cdd8327a53c34a9f678c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 25 Nov 2018 11:34:35 +0100 Subject: [PATCH 09/13] test failed because of typo --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index f3f684258..7f22579bf 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit f3f68425831d9b84906448861077f27cffe37e57 +Subproject commit 7f22579bf986795e307c471834eeff0806d0ac84 From ab3c6f07ccd15f833f91ca19356a38145356b6d8 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 25 Nov 2018 15:16:21 +0100 Subject: [PATCH 10/13] tests should not rely on derived quantities --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 7f22579bf..cf2e8104a 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 7f22579bf986795e307c471834eeff0806d0ac84 +Subproject commit cf2e8104a183a60ddec7ca05dd373ac44ecc5dd0 From e6f041ae23de205d02a1b35c9d642fea3fe69252 Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 25 Nov 2018 17:42:07 +0100 Subject: [PATCH 11/13] [skip ci] updated version information after successful test of v2.0.2-979-g5290a9ac --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7664f22a5..f1b5f7fcb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-976-gde4873e9 +v2.0.2-979-g5290a9ac From 2566cd9f6735e687b050a1e9e02cf44e65d7b3c4 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 25 Nov 2018 19:49:06 +0100 Subject: [PATCH 12/13] typo in PRIVATE --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index cf2e8104a..2e0ab3e25 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit cf2e8104a183a60ddec7ca05dd373ac44ecc5dd0 +Subproject commit 2e0ab3e2564fea6ac3779623065b47dfc3261ef5 From 6c242693bae98763d6c5d2afe531e4b00b59202d Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 26 Nov 2018 00:32:37 +0100 Subject: [PATCH 13/13] [skip ci] updated version information after successful test of v2.0.2-983-g0a648459 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f1b5f7fcb..939d675ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-979-g5290a9ac +v2.0.2-983-g0a648459