[cig-commits] [commit] master: removing unused module (310e69b)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Fri Oct 17 06:29:06 PDT 2014


Repository : https://github.com/geodynamics/axisem

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/a7274c4187f8a4a140704f8447435b03924ac272...310e69b719432ecd5a84ca462e72e3e9b78e68c8

>---------------------------------------------------------------

commit 310e69b719432ecd5a84ca462e72e3e9b78e68c8
Author: martinvandriel <vandriel at erdw.ethz.ch>
Date:   Fri Oct 17 15:28:07 2014 +0200

    removing unused module


>---------------------------------------------------------------

310e69b719432ecd5a84ca462e72e3e9b78e68c8
 MESHER/mapping_spheroid.f90 | 164 --------------------------------------------
 1 file changed, 164 deletions(-)

diff --git a/MESHER/mapping_spheroid.f90 b/MESHER/mapping_spheroid.f90
deleted file mode 100644
index 4a8ab80..0000000
--- a/MESHER/mapping_spheroid.f90
+++ /dev/null
@@ -1,164 +0,0 @@
-!
-!    Copyright 2013, Tarje Nissen-Meyer, Alexandre Fournier, Martin van Driel
-!                    Simon Stähler, Kasra Hosseini, Stefanie Hempel
-!
-!    This file is part of AxiSEM.
-!    It is distributed from the webpage <http://www.axisem.info>
-!
-!    AxiSEM is free software: you can redistribute it and/or modify
-!    it under the terms of the GNU General Public License as published by
-!    the Free Software Foundation, either version 3 of the License, or
-!    (at your option) any later version.
-!
-!    AxiSEM is distributed in the hope that it will be useful,
-!    but WITHOUT ANY WARRANTY; without even the implied warranty of
-!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-!    GNU General Public License for more details.
-!
-!    You should have received a copy of the GNU General Public License
-!    along with AxiSEM.  If not, see <http://www.gnu.org/licenses/>.
-!
-
-module mapping_spheroid
-  use global_parameters, only : sp, dp
-  implicit none
-  public :: map_spheroid
-  private
-
-contains
-
-!-----------------------------------------------------------------------------------------
-real(kind=dp) function map_spheroid(xi, eta, crd_nodes, idir)
-! We are working in polar coordinates here: theta
-! is the latitude.
-! idir = 1 : returns cylindrical radius s
-! idir = 2 : returns axial coordinate z
-!
-  real(kind=dp), intent(in)                :: xi, eta
-  real(kind=dp), dimension(8,2),intent(in) :: crd_nodes
-  integer                                  :: idir
-  real(kind=dp)                            :: abot, bbot, atop, btop
-  real(kind=dp)                            :: thetabarbot, dthetabot
-  real(kind=dp)                            :: thetabartop, dthetatop
-  real(kind=dp)                            :: sbot, zbot, stop, ztop
-  real(kind=dp)                            :: sbar, ds, slope, intersect
-
-  write(61,*)'map_spheroid!'
-
-  map_spheroid = 0.
-  call compute_parameters_sph(crd_nodes,abot,bbot,atop,btop,&
-                              thetabarbot,dthetabot,thetabartop,dthetatop)
-  call compute_sz_xi(sbot,zbot,xi,abot,bbot,thetabarbot,dthetabot)
-  call compute_sz_xi(stop,ztop,xi,atop,btop,thetabartop,dthetatop)
-  sbar = .5 * (sbot+stop) ; ds = stop-sbot
-
-  write(61,*)
-  write(61,*)'ds,sbar:',ds,sbar
-
-  if (idir == 1) then
-     write(61,*)'Direction 1!'
-     map_spheroid = sbar+ds*eta*.5
-
-  elseif (idir == 2) then
-     write(61,*)'Direction 2!'
-     if (abs(ds)>1.e-7) then
-        write(61,*)'abs > 1.d-10... intersect and slope'
-        intersect = (zbot*stop-ztop*sbot)/ds
-        slope = (ztop-zbot)/ds
-        map_spheroid = slope*(sbar+.5*ds*eta)+intersect
-     else
-        map_spheroid = .5*(zbot+ztop)+eta*(ztop-zbot)*.5
-     end if
-     write(61,*)'stop,sbot:',stop,sbot
-     write(61,*)'ztop,zbot:',ztop,zbot
-  end if
-  write(61,*)'map_spheroid',map_spheroid
- 
-  write(61,*)''
-
-end function map_spheroid
-!-----------------------------------------------------------------------------------------
-
-!-----------------------------------------------------------------------------------------
-pure subroutine compute_parameters_sph(crd_nodes, abot, bbot, atop, btop, &
-                              thetabarbot, dthetabot, thetabartop, dthetatop)
-  real(kind=dp), dimension(8,2),intent(in) :: crd_nodes
-  real(kind=dp), intent(out) :: abot,bbot,atop,btop
-  real(kind=dp), intent(out) :: thetabarbot,dthetabot
-  real(kind=dp), intent(out) :: thetabartop,dthetatop
-  real(kind=dp) :: s1,z1,s3,z3,s5,z5,s7,z7
-  real(kind=dp) :: theta1,theta3,theta5,theta7
-
-  s1 = crd_nodes(1,1)
-  z1 = crd_nodes(1,2)
-  
-  s3 = crd_nodes(3,1)
-  z3 = crd_nodes(3,2)
-  
-  s5 = crd_nodes(5,1)
-  z5 = crd_nodes(5,2)
-  
-  s7 = crd_nodes(7,1)
-  z7 = crd_nodes(7,2)
-
-  call compute_ab(abot,bbot,s1,z1,s3,z3)
-  call compute_theta(theta1,s1,z1,abot,bbot)
-  call compute_theta(theta3,s3,z3,abot,bbot)
-
-  call compute_ab(atop,btop,s7,z7,s5,z5)
-  call compute_theta(theta5,s5,z5,atop,btop)
-  call compute_theta(theta7,s7,z7,atop,btop)
-
-  thetabarbot = .5*(theta1+theta3)
-  dthetabot = theta3-theta1
-  thetabartop = .5*(theta7+theta5)
-  dthetatop = theta5 -theta7
-
-end subroutine compute_parameters_sph
-!-----------------------------------------------------------------------------------------
-
-!-----------------------------------------------------------------------------------------
-pure subroutine compute_ab(a, b, s1, z1, s2, z2)
-  
-  real(kind=dp), intent(out) :: a,b
-  real(kind=dp), intent(in) :: s1,z1,s2,z2
-
-  a = sqrt(abs((s2**2*z1**2-z2**2*s1**2)/(z1**2-z2**2)))
-  b = sqrt(abs((z1**2*s2**2-z2**2*s1**2)/(s2**2-s1**2)))
-
-end subroutine compute_ab
-!-----------------------------------------------------------------------------------------
-
-!-----------------------------------------------------------------------------------------
-pure subroutine compute_theta(theta,s,z,a,b)
-! This routine returns the latitude theta, given s and z.
-  
-  real(kind=dp), intent(out) :: theta
-  real(kind=dp), intent(in) :: s, z, a, b
-  real(kind=dp)    :: pi
-  
-  pi = 2.*asin(1.)
-  
-  if (s /= 0. ) then
-     theta=atan(z*a/(s*b))
-  else
-     if (z>0.) theta=.5*pi
-     if (z<0.) theta=-.5*pi
-  end if
-
-end subroutine compute_theta
-!-----------------------------------------------------------------------------------------
-
-!-----------------------------------------------------------------------------------------
-pure subroutine compute_sz_xi(s,z,xi,a,b,thetabar,dtheta)
-
-  real(kind=dp), intent(out) :: s,z
-  real(kind=dp), intent(in) :: xi, a, b, thetabar,dtheta
-
-  s = a*cos(thetabar+xi*.5*dtheta)
-  z = b*sin(thetabar+xi*.5*dtheta)
-
-end subroutine compute_sz_xi
-!-----------------------------------------------------------------------------------------
-
-end module mapping_spheroid



More information about the CIG-COMMITS mailing list