[cig-commits] [commit] devel: Better path handling for SEP binary files (ee16718)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Oct 7 10:26:45 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/da796d66db498395b73328a4c0abc2ab44d69482...ee16718484f79d2d00c6e4907fb0b7fd7016d995
>---------------------------------------------------------------
commit ee16718484f79d2d00c6e4907fb0b7fd7016d995
Author: Matthieu Lefebvre <ml15 at princeton.edu>
Date: Tue Oct 7 13:20:41 2014 -0400
Better path handling for SEP binary files
>---------------------------------------------------------------
ee16718484f79d2d00c6e4907fb0b7fd7016d995
EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh | 2 +-
EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/rho.H | 2 +-
EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vp.H | 2 +-
EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vs.H | 3 +--
src/generate_databases/model_sep.f90 | 9 ++++++---
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh b/EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh
index 05bd56e..eb21d44 100755
--- a/EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh
+++ b/EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh
@@ -65,7 +65,7 @@ mpirun -np $NPROC ./bin/xgenerate_databases
echo
echo " running solver..."
echo
-mpirun -np $NPROC ./bin/xspecfem3D
+#mpirun -np $NPROC ./bin/xspecfem3D
echo
echo "see results in directory: OUTPUT_FILES/"
diff --git a/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/rho.H b/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/rho.H
index fce87b0..ef9149a 100755
--- a/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/rho.H
+++ b/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/rho.H
@@ -15,4 +15,4 @@ label1="DEPTH"
unit3="METER"
esize=4
data_format="native_float"
-in=./sep_model/rho.H@
+in=rho.H@
diff --git a/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vp.H b/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vp.H
index 7857439..305c856 100755
--- a/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vp.H
+++ b/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vp.H
@@ -15,4 +15,4 @@ label1="DEPTH"
unit3="METER"
esize=4
data_format="native_float"
-in=./sep_model/vp.H@
+in=vp.H@
diff --git a/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vs.H b/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vs.H
index 149117e..3a7c608 100755
--- a/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vs.H
+++ b/EXAMPLES/meshfem3D_examples/sep_bathymetry/sep_model/vs.H
@@ -15,5 +15,4 @@ label1="DEPTH"
unit3="METER"
esize=4
data_format="native_float"
-in=./sep_model/vs.H@
-
+in=vs.H@
diff --git a/src/generate_databases/model_sep.f90 b/src/generate_databases/model_sep.f90
index 8c569bc..f91694a 100644
--- a/src/generate_databases/model_sep.f90
+++ b/src/generate_databases/model_sep.f90
@@ -117,7 +117,8 @@ subroutine model_sep()
!---------'
! Read available SEP files, assign default values for unfound files.
allocate(vp_sep(ni, nj, NZ))
- call read_sep_binary_mpiio(sep_bin_vp, NX, NY, NZ, ni, nj, NZ, &
+ call read_sep_binary_mpiio(trim(SEP_MODEL_DIRECTORY) // "/" // sep_bin_vp, &
+ NX, NY, NZ, ni, nj, NZ, &
imin, jmin, kmin, vp_sep)
! Interpolate SEP values on meshfem mesh.
rho_vp = 0.0
@@ -129,7 +130,8 @@ subroutine model_sep()
!---------'
if (vs_exists) then
allocate(vs_sep(ni, nj, NZ))
- call read_sep_binary_mpiio(sep_bin_vs, NX, NY, NZ, ni, nj, NZ, &
+ call read_sep_binary_mpiio(trim(SEP_MODEL_DIRECTORY) // "/" // sep_bin_vs, &
+ NX, NY, NZ, ni, nj, NZ, &
imin, jmin, kmin, vs_sep)
call interpolate_sep_on_mesh(vs_sep, xmin, ymin, ni, nj, NZ, &
DX, DY, DZ, rho_vs)
@@ -140,7 +142,8 @@ subroutine model_sep()
!----------'
if (rho_exists) then
allocate(rho_sep(ni, nj, NZ))
- call read_sep_binary_mpiio(sep_bin_rho, NX, NY, NZ, ni, nj, NZ, &
+ call read_sep_binary_mpiio(trim(SEP_MODEL_DIRECTORY) // "/" // sep_bin_rho, &
+ NX, NY, NZ, ni, nj, NZ, &
imin, jmin, kmin, rho_sep)
call interpolate_sep_on_mesh(rho_sep, xmin, ymin, ni, nj, NZ, &
DX, DY, DZ, rhostore)
More information about the CIG-COMMITS
mailing list