From d74c1534ed6b8308da2dd9b2021d76d3eba53314 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Mar 2021 12:43:27 +0100 Subject: [PATCH] bug fixes --- processing/legacy/gmsh_identifySurfaces.py | 16 +++++++++------- src/DAMASK_Marc.f90 | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/processing/legacy/gmsh_identifySurfaces.py b/processing/legacy/gmsh_identifySurfaces.py index 642b0a71e..9dbb81fbf 100755 --- a/processing/legacy/gmsh_identifySurfaces.py +++ b/processing/legacy/gmsh_identifySurfaces.py @@ -1,8 +1,9 @@ -#!/usr/bin/env python2.7 -# -*- coding: UTF-8 no BOM -*- +#!/usr/bin/env python3 -import os,re +import os +import re from optparse import OptionParser + import damask scriptName = os.path.splitext(os.path.basename(__file__))[0] @@ -11,6 +12,7 @@ scriptID = ' '.join([scriptName,damask.version]) def all_same(items,a): return all(x == a for x in items) + def func(seq): for x in seq: try: @@ -18,14 +20,14 @@ def func(seq): except ValueError: yield x + #-------------------------------------------------------------------------------------------------- # MAIN #-------------------------------------------------------------------------------------------------- +parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', + description =' Recognize bounding surfaces and append them as physical sufaces in the geo file.', + version = scriptID) -parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', description = """ -Recognize bounding surfaces and append them as physical sufaces in the geo file. - -""", version = scriptID) parser.add_option('-n','--numvol', dest = 'N', type='int', metavar='int', help='number of physical volumes' ) diff --git a/src/DAMASK_Marc.f90 b/src/DAMASK_Marc.f90 index 68265dbdb..e417be2fa 100644 --- a/src/DAMASK_Marc.f90 +++ b/src/DAMASK_Marc.f90 @@ -366,7 +366,7 @@ subroutine uedinc(inc,incsub) integer :: n, nqncomp, nqdatatype integer, save :: inc_written real(pReal), allocatable, dimension(:,:) :: d_n -#include QUOTE(PASTE(./marc/include/creeps,Marc4DAMASK)) ! creeps is needed for timinc (time increment) +#include QUOTE(PASTE(./Marc/include/creeps,Marc4DAMASK)) ! creeps is needed for timinc (time increment) if (inc > inc_written) then