Merge remote-tracking branch 'origin/development' into NOSlipFCC

.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
@@ -193,6 +200,13 @@ Post_ParaviewRelated:
     - master
     - release
 
+Post_OrientationConversion:
+  stage: postprocessing
+  script: OrientationConversion/test.py
+  except:
+    - master
+    - release
+
 ###################################################################################################
 Compile_Spectral_Intel:
   stage: compilePETScIntel
@@ -243,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

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

VERSION

@@ -1 +1 @@
-v2.0.2-961-gc0ad4967
+v2.0.2-983-g0a648459

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)
 

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