From 454a75ee88eeb4728fb9b7a65f26bcd1a6152221 Mon Sep 17 00:00:00 2001
From: Dave Whipp <dwhipp@dal.ca>
Date: Thu, 29 Sep 2011 15:45:41 +0000
Subject: [PATCH] Fixed typos with new define_bc input via input.txt file
---
src/define_bc.f90 | 11 ++++++++---
src/define_bc_segmented_s_line.f90 | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/define_bc.f90 b/src/define_bc.f90
index d958b671..f823db5a 100644
--- a/src/define_bc.f90
+++ b/src/define_bc.f90
@@ -72,6 +72,12 @@ if (params%nest) bccase='nest'
select case(trim(bccase))
case('input.txt','input.small.txt','basic')
+ if (trim(bccase).ne.'xyz' .or. trim(bccase).ne.'xzy' .or. &
+ trim(bccase).ne.'yxz' .or. trim(bccase).ne.'yzx' .or. &
+ trim(bccase).ne.'zxy' .or. trim(bccase).ne.'zyx') then
+ if (iproc==0) write (*,*) 'No/unsupported BC order provided, assuming bcorder=xyz'
+ endif
+
do i=1,osolve%nnode
select case(trim(bcdef%bcorder))
case ('xyz')
@@ -615,7 +621,6 @@ case('input.txt','input.small.txt','basic')
endif
case default
- if (iproc==0) write (*,*) 'No BC order provided, assuming bcorder=xyz'
if (osolve%x(i).lt.eps) then
if (bcdef%fixux0) then
osolve%kfix((i-1)*3+1)=1
@@ -753,13 +758,13 @@ case ('input.ritske_isurf','ritske_isurf')
call define_bc_ritske_isurf (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo)
case ('input.segmented_s_line','segmented_s_line')
- call define_bc_segmented_s_line (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo)
+ call define_bc_segmented_s_line (params,osolve,vo,bcdef,nest)
case ('input.sphere','sphere')
call define_bc_sphere (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo)
case ('input.subduction','subduction')
- call define_bc_subduction (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo)
+ call define_bc_subduction (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo)
case default
if (iproc.eq.0) print *,params%infile
diff --git a/src/define_bc_segmented_s_line.f90 b/src/define_bc_segmented_s_line.f90
index b71de8df..1ad8f46c 100644
--- a/src/define_bc_segmented_s_line.f90
+++ b/src/define_bc_segmented_s_line.f90
@@ -16,7 +16,7 @@
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
-subroutine define_bc_segmented_s_line(params,osolve,vo,bcdef,nest)
+subroutine define_bc_segmented_s_line(params,osolve,vo,bcdef,nest)
!------------------------------------------------------------------------------|
!(((((((((((((((( Purpose of the routine )))))))))))))))))))))))))))))))))))))
--
GitLab