From b0f9444175784b310376beac481779caa1aa7461 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 3 Apr 2019 16:24:45 +0000 Subject: [PATCH] correct types (PGI complained) --- src/commercialFEM_fileList.f90 | 1 + src/grid_mech_FEM.f90 | 16 ++++++++-------- src/spectral_utilities.f90 | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90 index 77a8f0df4..301274897 100644 --- a/src/commercialFEM_fileList.f90 +++ b/src/commercialFEM_fileList.f90 @@ -7,6 +7,7 @@ #include "numerics.f90" #include "debug.f90" #include "list.f90" +#include "future.f90" #include "config.f90" #ifdef DAMASKHDF5 #include "HDF5_utilities.f90" diff --git a/src/grid_mech_FEM.f90 b/src/grid_mech_FEM.f90 index 82273c8f1..e31d93637 100644 --- a/src/grid_mech_FEM.f90 +++ b/src/grid_mech_FEM.f90 @@ -153,7 +153,7 @@ subroutine grid_mech_FEM_init [grid(1)],[grid(2)],localK, & mech_grid,ierr) CHKERRQ(ierr) - call DMDASetUniformCoordinates(mech_grid,0.0,geomSize(1),0.0,geomSize(2),0.0,geomSize(3),ierr) + call DMDASetUniformCoordinates(mech_grid,0.0_pReal,geomSize(1),0.0_pReal,geomSize(2),0.0_pReal,geomSize(3),ierr) CHKERRQ(ierr) call SNESSetDM(mech_snes,mech_grid,ierr); CHKERRQ(ierr) call DMsetFromOptions(mech_grid,ierr); CHKERRQ(ierr) @@ -172,9 +172,9 @@ subroutine grid_mech_FEM_init !-------------------------------------------------------------------------------------------------- ! init fields - call VecSet(solution_current,0.0,ierr);CHKERRQ(ierr) - call VecSet(solution_lastInc,0.0,ierr);CHKERRQ(ierr) - call VecSet(solution_rate ,0.0,ierr);CHKERRQ(ierr) + call VecSet(solution_current,0.0_pReal,ierr);CHKERRQ(ierr) + call VecSet(solution_lastInc,0.0_pReal,ierr);CHKERRQ(ierr) + call VecSet(solution_rate ,0.0_pReal,ierr);CHKERRQ(ierr) call DMDAVecGetArrayF90(mech_grid,solution_current,u_current,ierr); CHKERRQ(ierr) call DMDAVecGetArrayF90(mech_grid,solution_lastInc,u_lastInc,ierr); CHKERRQ(ierr) @@ -412,11 +412,11 @@ subroutine grid_mech_FEM_forward(guess,timeinc,timeinc_old,loadCaseTime,deformat if (guess) then - call VecWAXPY(solution_rate,-1.0,solution_lastInc,solution_current,ierr) + call VecWAXPY(solution_rate,-1.0_pReal,solution_lastInc,solution_current,ierr) CHKERRQ(ierr) - call VecScale(solution_rate,1.0/timeinc_old,ierr); CHKERRQ(ierr) + call VecScale(solution_rate,1.0_pReal/timeinc_old,ierr); CHKERRQ(ierr) else - call VecSet(solution_rate,0.0,ierr); CHKERRQ(ierr) + call VecSet(solution_rate,0.0_pReal,ierr); CHKERRQ(ierr) endif call VecCopy(solution_current,solution_lastInc,ierr); CHKERRQ(ierr) @@ -590,7 +590,7 @@ subroutine formResidual(da_local,x_local,f_local,dummy,ierr) !-------------------------------------------------------------------------------------------------- ! constructing residual - call VecSet(f_local,0.0,ierr);CHKERRQ(ierr) + call VecSet(f_local,0.0_pReal,ierr);CHKERRQ(ierr) call DMDAVecGetArrayF90(da_local,f_local,f_scal,ierr);CHKERRQ(ierr) call DMDAVecGetArrayF90(da_local,x_local,x_scal,ierr);CHKERRQ(ierr) ele = 0 diff --git a/src/spectral_utilities.f90 b/src/spectral_utilities.f90 index dd79e67e2..4c5dc3169 100644 --- a/src/spectral_utilities.f90 +++ b/src/spectral_utilities.f90 @@ -253,7 +253,7 @@ subroutine utilities_init write(6,'(a,3(es12.5))') ' size x y z: ', geomSize num%memory_efficient = config_numerics%getInt ('memory_efficient', defaultVal=1) > 0 - num%FFTW_timelimit = config_numerics%getFloat ('fftw_timelimit', defaultVal=-1.0) + num%FFTW_timelimit = config_numerics%getFloat ('fftw_timelimit', defaultVal=-1.0_pReal) num%divergence_correction = config_numerics%getInt ('divergence_correction', defaultVal=2) num%spectral_derivative = config_numerics%getString('spectral_derivative', defaultVal='continuous') num%FFTW_plan_mode = config_numerics%getString('fftw_plan_mode', defaultVal='FFTW_MEASURE')