223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

did not compile without these statements

This commit is contained in:
Martin Diehl 2016-03-13 19:01:01 +01:00
parent e84e90448e
commit cf21d5ad49
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/Makefile
View File

@ -626,6 +626,7 @@ IO.o: IO.f90 \
DAMASK_interface.o: spectral_interface.f90 \ DAMASK_interface.o: spectral_interface.f90 \
$(wildcard DAMASK_FEM_interface.f90) \ $(wildcard DAMASK_FEM_interface.f90) \
prec.o prec.o
$(PREFIX) $(COMPILERNAME) $(COMPILE) -c $(INTERFACENAME) -o DAMASK_interface.o $(SUFFIX)
prec.o: prec.f90 \ prec.o: prec.f90 \
system_routines.o system_routines.o

8
code/spectral_interface.f90
View File

@ -250,7 +250,7 @@ character(len=1024) function storeWorkingDirectory(workingDirectoryArg,geometryA
if (geometryArg(1:1) == pathSep) then ! absolute path given as command line argument if (geometryArg(1:1) == pathSep) then ! absolute path given as command line argument
storeWorkingDirectory = geometryArg(1:scan(geometryArg,pathSep,back=.true.)) storeWorkingDirectory = geometryArg(1:scan(geometryArg,pathSep,back=.true.))
else else
error = getCWD2(cwd) ! relative path given as command line argument error = getCWD2(cwd) ! relative path given as command line argument
storeWorkingDirectory = trim(cwd)//pathSep//& storeWorkingDirectory = trim(cwd)//pathSep//&
geometryArg(1:scan(geometryArg,pathSep,back=.true.)) geometryArg(1:scan(geometryArg,pathSep,back=.true.))
endif endif
@ -264,6 +264,8 @@ end function storeWorkingDirectory
!> @brief simply returns the private string workingDir !> @brief simply returns the private string workingDir
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
character(len=1024) function getSolverWorkingDirectoryName() character(len=1024) function getSolverWorkingDirectoryName()
use system_routines, only: &
getCWD2
implicit none implicit none
getSolverWorkingDirectoryName = workingDirectory getSolverWorkingDirectoryName = workingDirectory
@ -302,6 +304,8 @@ end function getSolverJobName
!> @brief basename of geometry file with extension from command line arguments !> @brief basename of geometry file with extension from command line arguments
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
character(len=1024) function getGeometryFile(geometryParameter) character(len=1024) function getGeometryFile(geometryParameter)
use system_routines, only: &
getCWD2
implicit none implicit none
character(len=1024), intent(in) :: & character(len=1024), intent(in) :: &
@ -334,6 +338,8 @@ end function getGeometryFile
!> @brief relative path of loadcase from command line arguments !> @brief relative path of loadcase from command line arguments
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
character(len=1024) function getLoadCaseFile(loadCaseParameter) character(len=1024) function getLoadCaseFile(loadCaseParameter)
use system_routines, only: &
getCWD2
implicit none implicit none
character(len=1024), intent(in) :: & character(len=1024), intent(in) :: &