Skip to content

Improve triBiE src code #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daisy20170101 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve triBiE src code #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,17 @@ Please contact us if you need help with calculating stiffness using PyLith.
## Compilation

``
$ mpiifort src/phy3d_module_non.f90 src/3dtriBIE_v1.f90 -o 3dtriBIE
$ mpifort src/phy3d_module_non.f90 src/3dtriBIE_v1.f90 -O3 -o 3dtriBIE
``

Or using SCons (if installed):

``
$ scons -Q
``

Set `MPI_FC` environment variable to point to your MPI Fortran compiler if needed.

## Parameter files

Line 1: jobname (appendix)
Expand Down
12 changes: 5 additions & 7 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
#! /usr/bin/python

# This is the configuration file for compiling Tri3DSSE
# This is the configuration file for compiling TriBIE

import os
import sys
#import libs

mpi_fc = os.environ.get('MPI_FC', os.environ.get('MPIFC', 'mpifort'))

env=Environment(ENV={'PATH':os.environ['PATH']},LINK='mpiifort',F90='mpiifort')
#env.Tool('mpiifort')
env = Environment(ENV={'PATH': os.environ['PATH']}, LINK=mpi_fc, F90=mpi_fc, FORTRAN=mpi_fc)

sources=['3dtri_lock20_old.f90', 'phy3d_module_non.f90']
sources = ['src/phy3d_module_non.f90', 'src/3dtriBIE_v1.f90']

objs= env.Program(target='3dtri',source = ['src/phy3d_module_non.f90','src/3dtri_lock20_old.f90'])
program = env.Program(target='3dtriBIE', source=sources)



Expand Down
51 changes: 21 additions & 30 deletions src/3dtriBIE_v1.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,12 @@ program main
end if

call MPI_Barrier(MPI_COMM_WORLD,ierr)
call MPI_Scatter(cca_all,Nt,MPI_Real8,cca,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(ccb_all,Nt,MPI_Real8,ccb,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(xLf_all,Nt,MPI_Real8,xLf,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(seff_all,Nt,MPI_Real8,seff,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(x_all,Nt,MPI_Real8,x,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(z_all,Nt_all,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(cca_all,Nt,MPI_DOUBLE_PRECISION,cca,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(ccb_all,Nt,MPI_DOUBLE_PRECISION,ccb,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(xLf_all,Nt,MPI_DOUBLE_PRECISION,xLf,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(seff_all,Nt,MPI_DOUBLE_PRECISION,seff,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(x_all,Nt,MPI_DOUBLE_PRECISION,x,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(z_all,Nt_all,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)

call CPU_TIME(tmbegin)

Expand Down Expand Up @@ -261,13 +261,13 @@ program main
write(1,*)'This is a restart job. Start time ',t,' yr'
end if
call MPI_Barrier(MPI_COMM_WORLD,ierr)
call MPI_Bcast(t,1,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(dt,1,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(dt_try,1,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(t,1,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(dt,1,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(dt_try,1,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(ndt,1,MPI_integer,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(nrec,1,MPI_integer,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(yt_all,2*Nt,MPI_Real8,yt,2*Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(slip_all,Nt,MPI_Real8,slip,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(yt_all,2*Nt,MPI_DOUBLE_PRECISION,yt,2*Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Scatter(slip_all,Nt,MPI_DOUBLE_PRECISION,slip,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)

ndtnext = ndt
tprint_inter = t
Expand Down Expand Up @@ -315,10 +315,10 @@ program main
ndt = ndt + 1

call MPI_Barrier(MPI_COMM_WORLD,ierr)
call MPI_Gather(yt,2*Nt,MPI_Real8,yt_all,2*Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Gather(slipinc,Nt,MPI_Real8,slipinc_all,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Gather(slip,Nt,MPI_Real8,slip_all,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Gather(tau,Nt,MPI_Real8,tau_all,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Gather(yt,2*Nt,MPI_DOUBLE_PRECISION,yt_all,2*Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Gather(slipinc,Nt,MPI_DOUBLE_PRECISION,slipinc_all,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Gather(slip,Nt,MPI_DOUBLE_PRECISION,slip_all,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)
call MPI_Gather(tau,Nt,MPI_DOUBLE_PRECISION,tau_all,Nt,MPI_DOUBLE_PRECISION,master,MPI_COMM_WORLD,ierr)

!-------------------
! Output: (a single thread will do the writing while others
Expand Down Expand Up @@ -523,7 +523,7 @@ subroutine rkqs(myid,y,dydx,n,Nt_all,Nt,x,htry,eps,yscal,hdid,hnext,z_all,p)
real (DP) :: eps,hdid,hnext,htry,x
real (DP) :: dydx(n),y(n),yscal(n),z_all(Nt_all),p(Nt) !p is position
external derivs
real (DP) :: errmax,errmax1,h,htemp,xnew,errmax_all(nprocs)
real (DP) :: errmax,errmax1,h,htemp,xnew
real (DP), dimension(:), allocatable :: yerr,ytemp
real (DP), parameter :: SAFETY=0.9, PGROW=-.2,PSHRNK=-.25,ERRCON=1.89e-4

Expand All @@ -549,12 +549,7 @@ subroutine rkqs(myid,y,dydx,n,Nt_all,Nt,x,htry,eps,yscal,hdid,hnext,z_all,p)

call MPI_Barrier(MPI_COMM_WORLD,ierr)

call MPI_Gather(errmax,1,MPI_Real8,errmax_all,1,MPI_Real8,master,MPI_COMM_WORLD,ierr)

if(myid==master)then
errmax1=maxval(errmax_all)
end if
CALL MPI_BCAST(errmax1,1,MPI_REAL8,master,MPI_COMM_WORLD, ierr)
call MPI_Allreduce(errmax, errmax1, 1, MPI_DOUBLE_PRECISION, MPI_MAX, MPI_COMM_WORLD, ierr)

if(errmax1.gt.1.)then
htemp = SAFETY*h*(errmax1**PSHRNK)
Expand Down Expand Up @@ -669,8 +664,7 @@ subroutine derivs(myid,dydt,nv,Nt_all,Nt,t,yt,z_all,x)


call MPI_Barrier(MPI_COMM_WORLD,ierr)
call MPI_Gather(zz,Nt,MPI_Real8,zz_all,Nt,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Bcast(zz_all,Nt_all,MPI_Real8,master,MPI_COMM_WORLD,ierr)
call MPI_Allgather(zz,Nt,MPI_DOUBLE_PRECISION,zz_all,Nt,MPI_DOUBLE_PRECISION,MPI_COMM_WORLD,ierr)

!----------------------------------------------------------------------
! summation of stiffness of all elements in slab
Expand All @@ -691,10 +685,7 @@ subroutine derivs(myid,dydt,nv,Nt_all,Nt,t,yt,z_all,x)

! calculate stiffness*(Vkl-Vpl) of one proccessor.
do i=1,Nt
do j=1, Nt_all
! number in all element, total Nt_all
zzfric(i) = zzfric(i) + stiff(i,j)*zz_all(j)
end do
zzfric(i) = dot_product(stiff(i,1:Nt_all), zz_all(1:Nt_all))
end do

call CPU_TIME(tm2)
Expand All @@ -707,8 +698,8 @@ subroutine derivs(myid,dydt,nv,Nt_all,Nt,t,yt,z_all,x)
tm1=tm2

do i=1,Nt
if(yt(2*i).lt.0.00001)then
yt(2*i) = yt(2*i)+0.00001
if(yt(2*i).lt.1.0d-5)then
yt(2*i) = 1.0d-5
end if

if(yt(2*i-1).le.small)then
Expand Down
5 changes: 4 additions & 1 deletion src/phy3d_module_non.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
! Module to define global variables used in 3d_sub.f90 (or 3d_strike.f90)
Module phy3d_module_non
use, intrinsic :: iso_fortran_env, only: real64
public

integer, parameter :: DP0=kind(1.d0)
implicit none

integer, parameter :: DP0 = real64
integer :: IDin, IDout,Iprofile,Lratio,Nab,nprocs,Nl,Nd,hd
integer :: nmv,nas,ncos,nnul,nsse
real (DP0), parameter :: pi = 3.14159265358979323
Expand Down