[cig-commits] [commit] QA: ADIOS: Use consistent naming for variables in files. (39257a8)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Jan 20 07:11:57 PST 2014
Repository : ssh://geoshell/specfem3d
On branch : QA
Link : https://github.com/geodynamics/specfem3d/compare/4359ed56c14ef8f87387f46c8b705a1d395a40ba...8e7fca259d3e520c105549cfacfb92b6c83f8971
>---------------------------------------------------------------
commit 39257a8c343f1b2e69f1d9b648aebb6b73e6d9e8
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sun Jan 19 21:35:24 2014 -0500
ADIOS: Use consistent naming for variables in files.
The 1.6.0 release of ADIOS is stricter about variable naming in files.
It no longer treats '/<id>' as '<id>', so we need to use the same name
when reading as when writing.
>---------------------------------------------------------------
39257a8c343f1b2e69f1d9b648aebb6b73e6d9e8
.../read_partition_files_adios.F90 | 24 +++----
src/shared/combine_vol_data_adios_impl.f90 | 4 +-
src/specfem3D/read_mesh_databases_adios.F90 | 74 +++++++++++-----------
3 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/generate_databases/read_partition_files_adios.F90 b/src/generate_databases/read_partition_files_adios.F90
index 3679c71..8348b2d 100644
--- a/src/generate_databases/read_partition_files_adios.F90
+++ b/src/generate_databases/read_partition_files_adios.F90
@@ -121,21 +121,21 @@ subroutine read_partition_files_adios()
sel_num = sel_num+1
sel => selections(sel_num)
call adios_selection_writeblock(sel, myrank)
- call adios_schedule_read(handle, sel, "/nglob", 0, 1, nnodes_ext_mesh, ier)
- call adios_schedule_read(handle, sel, "/nspec", 0, 1, nelmnts_ext_mesh, ier)
+ call adios_schedule_read(handle, sel, "nglob", 0, 1, nnodes_ext_mesh, ier)
+ call adios_schedule_read(handle, sel, "nspec", 0, 1, nelmnts_ext_mesh, ier)
! read physical properties of the materials
! added poroelastic properties and filled with 0 the last 10 entries
! for elastic/acoustic
- call adios_schedule_read(handle, sel, "/nmaterials", 0, 1, nmat_ext_mesh, ier)
- call adios_schedule_read(handle, sel, "/nundef_materials", 0, 1, &
+ call adios_schedule_read(handle, sel, "nmaterials", 0, 1, nmat_ext_mesh, ier)
+ call adios_schedule_read(handle, sel, "nundef_materials", 0, 1, &
nundefMat_ext_mesh, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_xmin", 0, 1, nspec2D_xmin, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_xmax", 0, 1, nspec2D_xmax, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_ymin", 0, 1, nspec2D_ymin, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_ymax", 0, 1, nspec2D_ymax, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_bottom", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_xmin", 0, 1, nspec2D_xmin, ier)
+ call adios_schedule_read(handle, sel, "nspec2d_xmax", 0, 1, nspec2D_xmax, ier)
+ call adios_schedule_read(handle, sel, "nspec2d_ymin", 0, 1, nspec2D_ymin, ier)
+ call adios_schedule_read(handle, sel, "nspec2d_ymax", 0, 1, nspec2D_ymax, ier)
+ call adios_schedule_read(handle, sel, "nspec2d_bottom", 0, 1, &
nspec2D_bottom_ext, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_top", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_top", 0, 1, &
nspec2D_top_ext, ier)
! MPI interfaces between different partitions
num_interfaces_ext_mesh = 0
@@ -143,9 +143,9 @@ subroutine read_partition_files_adios()
if( NPROC > 1 ) then
! format: #number_of_MPI_interfaces
! #maximum_number_of_elements_on_each_interface
- call adios_schedule_read(handle, sel, "/nb_interfaces", 0, 1, &
+ call adios_schedule_read(handle, sel, "nb_interfaces", 0, 1, &
num_interfaces_ext_mesh, ier)
- call adios_schedule_read(handle, sel, "/nspec_interfaces_max", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec_interfaces_max", 0, 1, &
max_interface_size_ext_mesh, ier)
endif
! Perform the read, so we can use the values.
diff --git a/src/shared/combine_vol_data_adios_impl.f90 b/src/shared/combine_vol_data_adios_impl.f90
index ad190ff..4924654 100644
--- a/src/shared/combine_vol_data_adios_impl.f90
+++ b/src/shared/combine_vol_data_adios_impl.f90
@@ -167,8 +167,8 @@ subroutine read_scalars_adios_mesh(mesh_handle, iproc, NGLOB_AB, NSPEC_AB, &
integer :: ier
call adios_selection_writeblock(sel, iproc)
- call adios_schedule_read(mesh_handle, sel, "/nglob", 0, 1, NGLOB_AB, ier)
- call adios_schedule_read(mesh_handle, sel, "/nspec", 0, 1, NSPEC_AB, ier)
+ call adios_schedule_read(mesh_handle, sel, "nglob", 0, 1, NGLOB_AB, ier)
+ call adios_schedule_read(mesh_handle, sel, "nspec", 0, 1, NSPEC_AB, ier)
call adios_schedule_read(mesh_handle, sel, "ibool/offset", 0, 1, &
ibool_offset, ier)
call adios_schedule_read(mesh_handle, sel, "x_global/offset", 0, 1, &
diff --git a/src/specfem3D/read_mesh_databases_adios.F90 b/src/specfem3D/read_mesh_databases_adios.F90
index 43f1a73..576b1db 100644
--- a/src/specfem3D/read_mesh_databases_adios.F90
+++ b/src/specfem3D/read_mesh_databases_adios.F90
@@ -56,8 +56,8 @@ subroutine read_mesh_for_init(nspec, nglob)
! Read variables from the adios file |
!------------------------------------'
call adios_selection_writeblock(sel, myrank)
- call adios_schedule_read(handle, sel, "/nspec", 0, 1, nspec, ier)
- call adios_schedule_read(handle, sel, "/nglob", 0, 1, nglob, ier)
+ call adios_schedule_read(handle, sel, "nspec", 0, 1, nspec, ier)
+ call adios_schedule_read(handle, sel, "nglob", 0, 1, nglob, ier)
!--------------------------------------------.
! Perform the reads and close the adios file |
@@ -166,8 +166,8 @@ subroutine read_mesh_databases_adios()
sel_num = sel_num+1
sel => selections(sel_num)
call adios_selection_writeblock(sel, myrank)
- call adios_schedule_read(handle, sel, "/nspec", 0, 1, NSPEC_AB, ier)
- call adios_schedule_read(handle, sel, "/nglob", 0, 1, NGLOB_AB, ier)
+ call adios_schedule_read(handle, sel, "nspec", 0, 1, NSPEC_AB, ier)
+ call adios_schedule_read(handle, sel, "nglob", 0, 1, NGLOB_AB, ier)
call adios_perform_reads(handle, ier)
if (ier /= 0) call stop_all()
@@ -239,77 +239,77 @@ subroutine read_mesh_databases_adios()
NSPEC_CPML = 0
if( PML_CONDITIONS ) then
- call adios_schedule_read(handle, sel, "/nspec_cpml", 0, 1, nspec_cpml, ier)
- call adios_schedule_read(handle, sel, "/CPML_width_x", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec_cpml", 0, 1, nspec_cpml, ier)
+ call adios_schedule_read(handle, sel, "CPML_width_x", 0, 1, &
CPML_width_x, ier)
- call adios_schedule_read(handle, sel, "/CPML_width_y", 0, 1, &
+ call adios_schedule_read(handle, sel, "CPML_width_y", 0, 1, &
CPML_width_y, ier)
- call adios_schedule_read(handle, sel, "/CPML_width_x", 0, 1, &
+ call adios_schedule_read(handle, sel, "CPML_width_x", 0, 1, &
CPML_width_z, ier)
if( nspec_cpml > 0 ) then
if((SIMULATION_TYPE == 1 .and. SAVE_FORWARD) &
.or. SIMULATION_TYPE == 3) then
- call adios_schedule_read(handle, sel, "/nglob_interface_PML_acoustic", &
+ call adios_schedule_read(handle, sel, "nglob_interface_PML_acoustic", &
0, 1, nglob_interface_PML_acoustic, ier)
- call adios_schedule_read(handle, sel, "/nglob_interface_PML_elastic", &
+ call adios_schedule_read(handle, sel, "nglob_interface_PML_elastic", &
0, 1, nglob_interface_PML_elastic, ier)
endif
endif
endif
- call adios_schedule_read(handle, sel, "/num_abs_boundary_faces", 0, 1, &
+ call adios_schedule_read(handle, sel, "num_abs_boundary_faces", 0, 1, &
num_abs_boundary_faces, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_xmin", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_xmin", 0, 1, &
nspec2d_xmin, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_xmax", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_xmax", 0, 1, &
nspec2d_xmax, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_ymin", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_ymin", 0, 1, &
nspec2d_ymin, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_ymax", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_ymax", 0, 1, &
nspec2d_ymax, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_bottom", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_bottom", 0, 1, &
nspec2d_bottom, ier)
- call adios_schedule_read(handle, sel, "/nspec2d_top", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_top", 0, 1, &
nspec2d_top, ier)
- call adios_schedule_read(handle, sel, "/num_free_surface_faces", 0, 1, &
+ call adios_schedule_read(handle, sel, "num_free_surface_faces", 0, 1, &
num_free_surface_faces, ier)
- call adios_schedule_read(handle, sel, "/num_coupling_ac_el_faces", 0, 1, &
+ call adios_schedule_read(handle, sel, "num_coupling_ac_el_faces", 0, 1, &
num_coupling_ac_el_faces, ier)
- call adios_schedule_read(handle, sel, "/num_coupling_ac_po_faces", 0, 1, &
+ call adios_schedule_read(handle, sel, "num_coupling_ac_po_faces", 0, 1, &
num_coupling_ac_po_faces, ier)
- call adios_schedule_read(handle, sel, "/num_coupling_el_po_faces", 0, 1, &
+ call adios_schedule_read(handle, sel, "num_coupling_el_po_faces", 0, 1, &
num_coupling_el_po_faces, ier)
- call adios_schedule_read(handle, sel, "/num_interfaces_ext_mesh", 0, 1, &
+ call adios_schedule_read(handle, sel, "num_interfaces_ext_mesh", 0, 1, &
num_interfaces_ext_mesh, ier)
- call adios_schedule_read(handle, sel, "/max_nibool_interfaces_ext_mesh", 0, 1, &
+ call adios_schedule_read(handle, sel, "max_nibool_interfaces_ext_mesh", 0, 1, &
max_nibool_interfaces_ext_mesh, ier)
if( ACOUSTIC_SIMULATION ) then
- call adios_schedule_read(handle, sel, "/nspec_inner_acoustic", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec_inner_acoustic", 0, 1, &
nspec_inner_acoustic, ier)
- call adios_schedule_read(handle, sel, "/nspec_outer_acoustic", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec_outer_acoustic", 0, 1, &
nspec_outer_acoustic, ier)
- call adios_schedule_read(handle, sel, "/num_phase_ispec_acoustic", 0, 1, &
+ call adios_schedule_read(handle, sel, "num_phase_ispec_acoustic", 0, 1, &
num_phase_ispec_acoustic, ier)
endif
if( ELASTIC_SIMULATION ) then
- call adios_schedule_read(handle, sel, "/nspec_inner_elastic", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec_inner_elastic", 0, 1, &
nspec_inner_elastic, ier)
- call adios_schedule_read(handle, sel, "/nspec_outer_elastic", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec_outer_elastic", 0, 1, &
nspec_outer_elastic, ier)
- call adios_schedule_read(handle, sel, "/num_phase_ispec_elastic", 0, 1, &
+ call adios_schedule_read(handle, sel, "num_phase_ispec_elastic", 0, 1, &
num_phase_ispec_elastic, ier)
endif
if( POROELASTIC_SIMULATION) then
- call adios_schedule_read(handle, sel, "/nspec_inner_poroelastic", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec_inner_poroelastic", 0, 1, &
nspec_inner_poroelastic, ier)
- call adios_schedule_read(handle, sel, "/nspec_outer_poroelastic", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec_outer_poroelastic", 0, 1, &
nspec_outer_poroelastic, ier)
- call adios_schedule_read(handle, sel, "/num_phase_ispec_poroelastic", 0, 1,&
+ call adios_schedule_read(handle, sel, "num_phase_ispec_poroelastic", 0, 1,&
num_phase_ispec_poroelastic, ier)
endif
@@ -319,15 +319,15 @@ subroutine read_mesh_databases_adios()
num_colors_inner_elastic = 0
if( USE_MESH_COLORING_GPU ) then
if( ACOUSTIC_SIMULATION ) then
- call adios_schedule_read(handle, sel, "/num_colors_outer_acoustic", &
+ call adios_schedule_read(handle, sel, "num_colors_outer_acoustic", &
0, 1, num_colors_outer_acoustic, ier)
- call adios_schedule_read(handle, sel, "/num_colors_outer_acoustic", &
+ call adios_schedule_read(handle, sel, "num_colors_outer_acoustic", &
0, 1, num_colors_inner_acoustic, ier)
endif
if( ELASTIC_SIMULATION ) then
- call adios_schedule_read(handle, sel, "/num_colors_outer_elastic", &
+ call adios_schedule_read(handle, sel, "num_colors_outer_elastic", &
0, 1, num_colors_outer_elastic, ier)
- call adios_schedule_read(handle, sel, "/num_colors_outer_elastic", &
+ call adios_schedule_read(handle, sel, "num_colors_outer_elastic", &
0, 1, num_colors_inner_elastic, ier)
endif
endif
@@ -1774,7 +1774,7 @@ subroutine read_moho_mesh_adjoint_adios()
sel_num = sel_num+1
sel => selections(sel_num)
call adios_selection_writeblock(sel, myrank)
- call adios_schedule_read(handle, sel, "/nspec2d_moho", 0, 1, &
+ call adios_schedule_read(handle, sel, "nspec2d_moho", 0, 1, &
NSPEC2D_MOHO, ier)
call adios_perform_reads(handle, ier)
if (ier /= 0) call stop_all()
More information about the CIG-COMMITS
mailing list