From 885a71c0b7df5c0322b924426bbf0a3da7e06a28 Mon Sep 17 00:00:00 2001 From: Pratheek Shanthraj Date: Fri, 10 Oct 2014 08:40:59 +0000 Subject: [PATCH] cleaned up compilation for FEM --- code/IO.f90 | 2 +- code/constitutive.f90 | 4 ++-- code/prec.f90 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/IO.f90 b/code/IO.f90 index 7a9c2bc0c..e34462c75 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -103,7 +103,7 @@ contains subroutine IO_init use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) #ifdef FEM -#include +#include PetscInt :: worldrank PetscErrorCode :: ierr #endif diff --git a/code/constitutive.f90 b/code/constitutive.f90 index f3e95aa02..f15d2fbe6 100644 --- a/code/constitutive.f90 +++ b/code/constitutive.f90 @@ -180,7 +180,7 @@ subroutine constitutive_init ! parse thermal from config file if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present... call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file - if (any(phase_thermal == LOCAL_THERMAL_ISOTHERMAL_ID)) call thermal_isothermal_init(FILEUNIT) + if (any(phase_thermal == LOCAL_THERMAL_isothermal_ID)) call thermal_isothermal_init(FILEUNIT) if (any(phase_thermal == LOCAL_THERMAL_adiabatic_ID)) call thermal_adiabatic_init(FILEUNIT) close(FILEUNIT) @@ -945,7 +945,7 @@ function constitutive_getAdiabaticTemperature(ipc, ip, el) real(pReal) :: constitutive_getAdiabaticTemperature select case (phase_thermal(material_phase(ipc,ip,el))) - case (LOCAL_THERMAL_ISOTHERMAL_ID) + case (LOCAL_THERMAL_isothermal_ID) constitutive_getAdiabaticTemperature = lattice_referenceTemperature(material_phase(ipc,ip,el)) case (LOCAL_THERMAL_adiabatic_ID) diff --git a/code/prec.f90 b/code/prec.f90 index 2da5d5814..7fb5025ae 100644 --- a/code/prec.f90 +++ b/code/prec.f90 @@ -97,7 +97,7 @@ subroutine prec_init implicit none #ifdef FEM -#include +#include PetscInt :: worldrank PetscErrorCode :: ierr #endif