Merge branch 'Python3' into development
This commit is contained in:
commit
de4873e952
|
@ -151,6 +151,13 @@ Spectral_geometryPacking:
|
||||||
- release
|
- release
|
||||||
|
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
|
Post_AverageDown:
|
||||||
|
stage: postprocessing
|
||||||
|
script: averageDown/test.py
|
||||||
|
except:
|
||||||
|
- master
|
||||||
|
- release
|
||||||
|
|
||||||
Post_General:
|
Post_General:
|
||||||
stage: postprocessing
|
stage: postprocessing
|
||||||
script: PostProcessing/test.py
|
script: PostProcessing/test.py
|
||||||
|
|
|
@ -47,7 +47,7 @@ linker:
|
||||||
|
|
||||||
# CMake will execute each target in the ${petsc_config_makefile}
|
# CMake will execute each target in the ${petsc_config_makefile}
|
||||||
# to acquire corresponding PETSc Variables.
|
# 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
|
# Find the PETSc includes directory settings
|
||||||
execute_process (COMMAND ${MAKE_EXECUTABLE} --no-print-directory -f ${petsc_config_makefile} "includes"
|
execute_process (COMMAND ${MAKE_EXECUTABLE} --no-print-directory -f ${petsc_config_makefile} "includes"
|
||||||
RESULT_VARIABLE PETSC_INCLUDES_RETURN
|
RESULT_VARIABLE PETSC_INCLUDES_RETURN
|
||||||
|
|
2
PRIVATE
2
PRIVATE
|
@ -1 +1 @@
|
||||||
Subproject commit dd70ef078e0b4422b4bf81030e896a7bd098e841
|
Subproject commit 8b171cf15da322c5cd1943144a0f511d56e42fa2
|
|
@ -127,7 +127,7 @@ options.fraction = np.array(options.fraction)
|
||||||
options.grid = np.array(options.grid)
|
options.grid = np.array(options.grid)
|
||||||
gridSize = options.grid.prod()
|
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
|
np.random.seed(options.randomSeed) # init random generators
|
||||||
random.seed(options.randomSeed)
|
random.seed(options.randomSeed)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue