From 43cc68555b7393d15040e02ca5167f47e0514af5 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 11 May 2011 16:40:51 +0000 Subject: [PATCH] observe new include subdirectory --- code/DAMASK_marc.f90 | 4 ++-- code/setup/setup_code.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/DAMASK_marc.f90 b/code/DAMASK_marc.f90 index 6b8fbf043..57f8b6b5d 100644 --- a/code/DAMASK_marc.f90 +++ b/code/DAMASK_marc.f90 @@ -250,8 +250,8 @@ subroutine hypela2(& ! Marc common blocks are in fixed format so they have to be reformated to free format (f90) ! Beware of changes in newer Marc versions - include "concom%%MARCVERSION%%" ! concom is needed for inc, subinc, ncycle, lovl - include "creeps%%MARCVERSION%%" ! creeps is needed for timinc (time increment) + include "include/concom%%MARCVERSION%%" ! concom is needed for inc, subinc, ncycle, lovl + include "include/creeps%%MARCVERSION%%" ! creeps is needed for timinc (time increment) real(pReal), dimension(6) :: stress real(pReal), dimension(6,6) :: ddsdde diff --git a/code/setup/setup_code.py b/code/setup/setup_code.py index 24fefd35f..ff22347f1 100755 --- a/code/setup/setup_code.py +++ b/code/setup/setup_code.py @@ -5,7 +5,7 @@ import os,sys architectures = { 'marc': { - 'parent': 'mpie_cpfem_marc.f90', + 'parent': 'DAMASK_marc.f90', 'versions' : ['%%MARCVERSION%%','2007r1','2008r1','2010'], }, }