[cig-commits] [commit] devel: renamed QUART to QUARTER (57a15de)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Feb 10 16:32:32 PST 2014
Repository : ssh://geoshell/specfem2d
On branch : devel
Link : https://github.com/geodynamics/specfem2d/compare/5729b51ab6c4a71ceba52762c105f3bc792eb9af...594a714d2be70c6eedd3f07b2dcbb97364c4e08c
>---------------------------------------------------------------
commit 57a15de8f00fb401613f8355cd6925c4670a28e2
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Tue Feb 11 01:31:36 2014 +0100
renamed QUART to QUARTER
>---------------------------------------------------------------
57a15de8f00fb401613f8355cd6925c4670a28e2
setup/constants.h.in | 2 +-
src/specfem2D/define_shape_functions.f90 | 52 +++++++++++++-------------
src/specfem2D/prepare_source_time_function.f90 | 2 +-
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/setup/constants.h.in b/setup/constants.h.in
index 85c1736..90684fd 100644
--- a/setup/constants.h.in
+++ b/setup/constants.h.in
@@ -126,7 +126,7 @@
! a few useful constants
double precision, parameter :: ZERO = 0.d0,ONE = 1.d0
- double precision, parameter :: HALF = 0.5d0,TWO = 2.d0,QUART = 0.25d0
+ double precision, parameter :: HALF = 0.5d0,TWO = 2.d0,QUARTER = 0.25d0
! pi
double precision, parameter :: PI = 3.141592653589793d0
diff --git a/src/specfem2D/define_shape_functions.f90 b/src/specfem2D/define_shape_functions.f90
index 82ac1bc..73e3ac5 100644
--- a/src/specfem2D/define_shape_functions.f90
+++ b/src/specfem2D/define_shape_functions.f90
@@ -92,20 +92,20 @@
tm = t - ONE
!---- corner nodes
- shape2D(1) = QUART * sm * tm
- shape2D(2) = - QUART * sp * tm
- shape2D(3) = QUART * sp * tp
- shape2D(4) = - QUART * sm * tp
+ shape2D(1) = QUARTER * sm * tm
+ shape2D(2) = - QUARTER * sp * tm
+ shape2D(3) = QUARTER * sp * tp
+ shape2D(4) = - QUARTER * sm * tp
- dershape2D(1,1) = QUART * tm
- dershape2D(1,2) = - QUART * tm
- dershape2D(1,3) = QUART * tp
- dershape2D(1,4) = - QUART * tp
+ dershape2D(1,1) = QUARTER * tm
+ dershape2D(1,2) = - QUARTER * tm
+ dershape2D(1,3) = QUARTER * tp
+ dershape2D(1,4) = - QUARTER * tp
- dershape2D(2,1) = QUART * sm
- dershape2D(2,2) = - QUART * sp
- dershape2D(2,3) = QUART * sp
- dershape2D(2,4) = - QUART * sm
+ dershape2D(2,1) = QUARTER * sm
+ dershape2D(2,2) = - QUARTER * sp
+ dershape2D(2,3) = QUARTER * sp
+ dershape2D(2,4) = - QUARTER * sm
!---- 9-node element
else if(ngnod == 9) then
@@ -121,20 +121,20 @@
st = s * t
!---- corner nodes
- shape2D(1) = QUART * sm * st * tm
- shape2D(2) = QUART * sp * st * tm
- shape2D(3) = QUART * sp * st * tp
- shape2D(4) = QUART * sm * st * tp
-
- dershape2D(1,1) = QUART * tm * t * (s2 - ONE)
- dershape2D(1,2) = QUART * tm * t * (s2 + ONE)
- dershape2D(1,3) = QUART * tp * t * (s2 + ONE)
- dershape2D(1,4) = QUART * tp * t * (s2 - ONE)
-
- dershape2D(2,1) = QUART * sm * s * (t2 - ONE)
- dershape2D(2,2) = QUART * sp * s * (t2 - ONE)
- dershape2D(2,3) = QUART * sp * s * (t2 + ONE)
- dershape2D(2,4) = QUART * sm * s * (t2 + ONE)
+ shape2D(1) = QUARTER * sm * st * tm
+ shape2D(2) = QUARTER * sp * st * tm
+ shape2D(3) = QUARTER * sp * st * tp
+ shape2D(4) = QUARTER * sm * st * tp
+
+ dershape2D(1,1) = QUARTER * tm * t * (s2 - ONE)
+ dershape2D(1,2) = QUARTER * tm * t * (s2 + ONE)
+ dershape2D(1,3) = QUARTER * tp * t * (s2 + ONE)
+ dershape2D(1,4) = QUARTER * tp * t * (s2 - ONE)
+
+ dershape2D(2,1) = QUARTER * sm * s * (t2 - ONE)
+ dershape2D(2,2) = QUARTER * sp * s * (t2 - ONE)
+ dershape2D(2,3) = QUARTER * sp * s * (t2 + ONE)
+ dershape2D(2,4) = QUARTER * sm * s * (t2 + ONE)
!---- midside nodes
shape2D(5) = HALF * tm * t * (ONE - ss)
diff --git a/src/specfem2D/prepare_source_time_function.f90 b/src/specfem2D/prepare_source_time_function.f90
index febfb5a..5f99866 100644
--- a/src/specfem2D/prepare_source_time_function.f90
+++ b/src/specfem2D/prepare_source_time_function.f90
@@ -165,7 +165,7 @@
omega_coa = TWO * PI * f0(i_source)
omegat = omega_coa * ( time - DecT )
source_time_function(i_source,it,i_stage) = factor(i_source) * HALF * &
- sin( omegat ) * ( ONE - cos( QUART * omegat ) )
+ sin( omegat ) * ( ONE - cos( QUARTER * omegat ) )
!source_time_function(i_source,it,i_stage) = - factor(i_source) * HALF / omega_coa / omega_coa * &
! ( sin(omegat) - 8.d0 / 9.d0 * sin(3.d0/ 4.d0 * omegat) - 8.d0 / 25.d0 * sin(5.d0 / 4.d0 * omegat) )
More information about the CIG-COMMITS
mailing list