[cig-commits] [commit] master: removing homo stuff (9b21c27)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Oct 17 05:30:12 PDT 2014
Repository : https://github.com/geodynamics/axisem
On branch : master
Link : https://github.com/geodynamics/axisem/compare/607f803cf074063627513d235f9ed0837fc1dd44...b6457db24acdde4a4e1c08935ae1b22adf87f5bf
>---------------------------------------------------------------
commit 9b21c27b9460bd6ed68929482ad09729b8e95c13
Author: martinvandriel <vandriel at erdw.ethz.ch>
Date: Thu Oct 16 20:42:08 2014 +0200
removing homo stuff
>---------------------------------------------------------------
9b21c27b9460bd6ed68929482ad09729b8e95c13
SOLVER/data_mesh.f90 | 9 ++-------
SOLVER/def_grid.f90 | 3 ---
SOLVER/get_model.F90 | 8 --------
SOLVER/inparam_advanced.TEMPLATE | 6 ------
SOLVER/parameters.F90 | 31 +++----------------------------
5 files changed, 5 insertions(+), 52 deletions(-)
diff --git a/SOLVER/data_mesh.f90 b/SOLVER/data_mesh.f90
index fb9d57b..97b0fd6 100644
--- a/SOLVER/data_mesh.f90
+++ b/SOLVER/data_mesh.f90
@@ -18,10 +18,8 @@
! You should have received a copy of the GNU General Public License
! along with AxiSEM. If not, see <http://www.gnu.org/licenses/>.
!
-
-!===================
+!=========================================================================================
module data_mesh
-!===================
! Arrays here pertain to some sort of mesh peculiarities and mainly serve
! as information or parameters for many "if"-decisions such as
@@ -126,8 +124,6 @@ module data_mesh
logical, allocatable :: solid_domain(:)
integer, allocatable :: idom_fluid(:)
real(kind=dp) :: rmin, minh_ic, maxh_ic, maxh_icb
- logical :: make_homo
- real(kind=dp) :: vphomo, vshomo, rhohomo
logical :: anel_true ! anelastic model?
!--------------------------------------------------------------------------
@@ -292,6 +288,5 @@ subroutine read_mesh_axel(iounit)
end subroutine
!-----------------------------------------------------------------------------------------
-!=======================
end module data_mesh
-!=======================
+!=========================================================================================
diff --git a/SOLVER/def_grid.f90 b/SOLVER/def_grid.f90
index 796920b..e16795f 100644
--- a/SOLVER/def_grid.f90
+++ b/SOLVER/def_grid.f90
@@ -1223,9 +1223,6 @@ subroutine compute_volume
elseif (bkgrdmodel(1:4) == 'iasp') then
router_fluid = 3482000.d0 ! CMB
rinner_fluid = 1217000.d0 ! ICB
- elseif (bkgrdmodel(1:4)=='homo') then
- rinner_fluid = 3000.d0
- router_fluid = rinner_fluid
else
write(6,*)' !!WARNING!! Do not know the fluid for model',bkgrdmodel
write(6,*)' ....setting outer/inner equal -> assuming no fluid'
diff --git a/SOLVER/get_model.F90 b/SOLVER/get_model.F90
index aa72b8b..ba3870d 100644
--- a/SOLVER/get_model.F90
+++ b/SOLVER/get_model.F90
@@ -101,14 +101,6 @@ subroutine read_model(rho, lambda, mu, xi_ani, phi_ani, eta_ani, &
logical :: foundit
character(len=100) :: modelstring
- if (make_homo ) then
- write(6,*)' '
- write(6,*)'ERROR: homogeneous AND anisotropic model does not make '
- write(6,*)' sense, check input file'
- write(6,*)' '
- stop
- endif
-
! Set elastic parameters to crazy values to later check if all have been filled
rho(0:npol,0:npol,1:nelem) = -1.E30
lambda(0:npol,0:npol,1:nelem) = -1.E30
diff --git a/SOLVER/inparam_advanced.TEMPLATE b/SOLVER/inparam_advanced.TEMPLATE
index 0b4e696..c00368b 100644
--- a/SOLVER/inparam_advanced.TEMPLATE
+++ b/SOLVER/inparam_advanced.TEMPLATE
@@ -212,9 +212,3 @@ COARSE_GRAINED true
######################## FOR THE INCLINED ######################################
# Save global kinetic/potential energy? generally not needed
SAVE_ENERGY .false.
-
-# overwrite background model with homogeneous parameters?
-HOMO_MODEL .false.
-HOMO_VP 10.
-HOMO_VS 5.77
-HOMO_RHO 3.
diff --git a/SOLVER/parameters.F90 b/SOLVER/parameters.F90
index 7dc3246..4b66ecc 100644
--- a/SOLVER/parameters.F90
+++ b/SOLVER/parameters.F90
@@ -75,7 +75,7 @@ end subroutine
!! data paths, specification of wavefield dumping etc.
subroutine readin_parameters
- use data_mesh, only: make_homo, do_mesh_tests
+ use data_mesh, only: do_mesh_tests
call read_inparam_basic
@@ -98,7 +98,7 @@ subroutine readin_parameters
enforced_period, trim(simtype), rec_file_type, &
sum_seis, sum_fields, time_scheme, seis_dt, &
dump_energy, dump_vtk, dump_wavefields, &
- dump_type, ibeg, iend, jbeg, jend, strain_samp, src_dump_type, make_homo, &
+ dump_type, ibeg, iend, jbeg, jend, strain_samp, src_dump_type, &
add_hetero, do_mesh_tests, output_format
20 format(/&
@@ -200,7 +200,6 @@ subroutine readin_parameters
12x,'Last GLL to save in strains: ',i2,/ &
12x,'Samples per period for strains: ',f7.3,/ &
12x,'Source dumping type: ',a4,/ &
- 12x,'Homogenize background model? ',l2,/ &
12x,'Add heterogeneous region? ',l2,/ &
12x,'Perform extensive mesh tests? ',l2,/ &
12x,'Output format (seism., wavefields): ',a6,/ &
@@ -357,7 +356,7 @@ end subroutine
subroutine read_inparam_advanced
use nc_routines, only: nc_dumpbuffersize
- use data_mesh, only: naxel, meshname, vphomo, vshomo, rhohomo, make_homo, do_mesh_tests
+ use data_mesh, only: naxel, meshname, do_mesh_tests
use commun, only: broadcast_int, broadcast_log, broadcast_char, broadcast_dble
integer :: iinparam_advanced=500, ioerr
@@ -393,10 +392,6 @@ subroutine read_inparam_advanced
kwf_thetamax = pi
dump_energy = .false.
- make_homo = .false.
- vphomo = 10.
- vshomo = 10.
- rhohomo = 10.
deflate_level = 5
snap_dt = 20.
@@ -516,21 +511,6 @@ subroutine read_inparam_advanced
case('SAVE_ENERGY')
read(keyvalue,*) dump_energy
- case('HOMO_MODEL')
- read(keyvalue,*) make_homo
-
- case('HOMO_VP')
- read(keyvalue,*) vphomo
- vphomo = vphomo * 1.e3
-
- case('HOMO_VS')
- read(keyvalue,*) vshomo
- vshomo = vshomo * 1.e3
-
- case('HOMO_RHO')
- read(keyvalue,*) rhohomo
- rhohomo = rhohomo * 1.e3
-
case('USE_NETCDF')
read(keyvalue, *) use_netcdf
@@ -620,11 +600,6 @@ subroutine read_inparam_advanced
call broadcast_int(jend, 0)
call broadcast_log(dump_energy, 0)
- call broadcast_log(make_homo, 0)
-
- call broadcast_dble(vphomo, 0)
- call broadcast_dble(vshomo, 0)
- call broadcast_dble(rhohomo, 0)
call broadcast_int(deflate_level, 0)
call broadcast_dble(snap_dt, 0)
More information about the CIG-COMMITS
mailing list