From cf4d0bd0cba4ffd9c6e35ec6912c6b7ec2d6eaf8 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 26 Mar 2019 21:42:11 +0100 Subject: [PATCH] strange abaqus python causes problems --- installation/mods_Abaqus/abaqus_v6.env | 10 ++-------- installation/mods_Abaqus/abaqus_v6_debug.env | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/installation/mods_Abaqus/abaqus_v6.env b/installation/mods_Abaqus/abaqus_v6.env index 6704b0444..55902278e 100644 --- a/installation/mods_Abaqus/abaqus_v6.env +++ b/installation/mods_Abaqus/abaqus_v6.env @@ -11,11 +11,8 @@ # Compile_cpp and link_exe for Abaqus make utility. # import os, re, glob, driverUtils -from damask import version as DAMASKVERSION -from damask import Environment -myEnv = Environment() -if myEnv.options['DAMASK_HDF5'] == 'ON': +if false: # use hdf5 compiler wrapper in $PATH fortCmd = os.popen('h5fc -shlib -show').read().replace('\n','') # complicated way needed to pass in DAMASKVERSION string link_sl += fortCmd.split()[1:] @@ -44,7 +41,7 @@ compile_fortran = (fortCmd + " -c -fPIC -auto -shared-intel " + "-implicitnone -standard-semantics " + "-assume nostd_mod_proc_name " + "-real-size 64 " + - '-DDAMASKVERSION=\\\"%s\\\"'%DAMASKVERSION) + '-DDAMASKVERSION=\\\"n/a\\\"') # Abaqus/CAE will generate an input file without parts and assemblies. cae_no_parts_input_file=ON @@ -57,6 +54,3 @@ ask_delete=OFF # Remove the temporary names from the namespace del fortCmd -del Environment -del myEnv -del DAMASKVERSION diff --git a/installation/mods_Abaqus/abaqus_v6_debug.env b/installation/mods_Abaqus/abaqus_v6_debug.env index 1bf6b1a6e..2d28056ff 100644 --- a/installation/mods_Abaqus/abaqus_v6_debug.env +++ b/installation/mods_Abaqus/abaqus_v6_debug.env @@ -11,11 +11,8 @@ # Compile_cpp and link_exe for Abaqus make utility. # import os, re, glob, driverUtils -from damask import version as DAMASKVERSION -from damask import Environment -myEnv = Environment() -if myEnv.options['DAMASK_HDF5'] == 'ON': +if false: # use hdf5 compiler wrapper in $PATH fortCmd = os.popen('h5fc -shlib -show').read().replace('\n','') # complicated way needed to pass in DAMASKVERSION string link_sl += fortCmd.split()[1:] @@ -49,7 +46,7 @@ compile_fortran = (fortCmd + " -c -fPIC -auto -shared-intel " + "-check bounds,format,output_conversion,uninit " + "-ftrapuv -fpe-all0 " + "-g -traceback -gen-interfaces -fp-stack-check -fp-model strict " + - '-DDAMASKVERSION=\\\"%s\\\"'%DAMASKVERSION) + '-DDAMASKVERSION=\\\"n/a\\\"') # Abaqus/CAE will generate an input file without parts and assemblies. cae_no_parts_input_file=ON @@ -62,6 +59,3 @@ ask_delete=OFF # Remove the temporary names from the namespace del fortCmd -del Environment -del myEnv -del DAMASKVERSION