[cig-commits] [commit] devel: updates NX_BATHY/NY_BATHY usage in values_from_mesher.h (aafa354)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/3ad4ad0dda8bce0265d5fa9ed7567ee338346d81...133892d126073f174444ba2cb859e8cc72f5478e

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

commit aafa354be9ceeb25813896c35368310cefdfde81
Author: daniel peter <peterda at ethz.ch>
Date:   Thu Jan 8 11:20:52 2015 +0100

    updates NX_BATHY/NY_BATHY usage in values_from_mesher.h


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

aafa354be9ceeb25813896c35368310cefdfde81
 src/meshfem3D/model_crustmaps.f90           | 5 +++++
 src/shared/memory_eval.f90                  | 2 +-
 src/shared/save_header_file.F90             | 4 ++--
 src/tomography/addition_sem.f90             | 2 +-
 src/tomography/convert_model_file_adios.f90 | 2 +-
 src/tomography/difference_sem.f90           | 2 +-
 src/tomography/interpolate_model.F90        | 2 +-
 src/tomography/smooth_sem.F90               | 2 +-
 src/tomography/tomography_par.f90           | 2 +-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/meshfem3D/model_crustmaps.f90 b/src/meshfem3D/model_crustmaps.f90
index b1973cd..2d57a00 100644
--- a/src/meshfem3D/model_crustmaps.f90
+++ b/src/meshfem3D/model_crustmaps.f90
@@ -358,6 +358,11 @@
   ! by defaults uses only 1 point location
   num_points = 1
 
+  ! initializes cap arrays (to avoid compiler warning)
+  xlat(:) = 0.d0
+  xlon(:) = 0.d0
+  weight(:) = 0.d0
+
   ! checks if inside/outside of critical region for mesh stretching
   if (SMOOTH_CRUST_EVEN_MORE) then
 
diff --git a/src/shared/memory_eval.f90 b/src/shared/memory_eval.f90
index 133aa13..7438b0d 100644
--- a/src/shared/memory_eval.f90
+++ b/src/shared/memory_eval.f90
@@ -415,7 +415,7 @@
   static_memory_size = static_memory_size + &
       4.d0*NPROCTOT*dble(SIZE_INTEGER)
 
-  if (TOPOGRAPHY) then
+  if (TOPOGRAPHY .or. OCEANS) then
     ! ibathy_topo
     static_memory_size = static_memory_size + &
       NX_BATHY*NY_BATHY*dble(SIZE_INTEGER)
diff --git a/src/shared/save_header_file.F90 b/src/shared/save_header_file.F90
index b8e3484..0f5dce7 100644
--- a/src/shared/save_header_file.F90
+++ b/src/shared/save_header_file.F90
@@ -638,8 +638,8 @@
   write(IOUT,*)
 
   if (TOPOGRAPHY .or. OCEANS) then
-    write(IOUT,*) 'integer, parameter :: NX_BATHY_VAL = NX_BATHY'
-    write(IOUT,*) 'integer, parameter :: NY_BATHY_VAL = NY_BATHY'
+    write(IOUT,*) 'integer, parameter :: NX_BATHY_VAL = ',NX_BATHY
+    write(IOUT,*) 'integer, parameter :: NY_BATHY_VAL = ',NY_BATHY
   else
     write(IOUT,*) 'integer, parameter :: NX_BATHY_VAL = 1'
     write(IOUT,*) 'integer, parameter :: NY_BATHY_VAL = 1'
diff --git a/src/tomography/addition_sem.f90 b/src/tomography/addition_sem.f90
index 29fe5d8..9720ddc 100644
--- a/src/tomography/addition_sem.f90
+++ b/src/tomography/addition_sem.f90
@@ -37,7 +37,7 @@
 
 program addition_sem
 
-  use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,NX_BATHY,NY_BATHY,IIN,IOUT,MAX_STRING_LEN
+  use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,IIN,IOUT,MAX_STRING_LEN
 
   implicit none
 
diff --git a/src/tomography/convert_model_file_adios.f90 b/src/tomography/convert_model_file_adios.f90
index fe7ff2f..edc24fd 100644
--- a/src/tomography/convert_model_file_adios.f90
+++ b/src/tomography/convert_model_file_adios.f90
@@ -34,7 +34,7 @@ program convert_model_file_adios
   use adios_write_mod
   use adios_helpers_mod
 
-  use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,NX_BATHY,NY_BATHY,IIN,IOUT, &
+  use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,IIN,IOUT, &
     ADIOS_TRANSPORT_METHOD,ADIOS_BUFFER_SIZE_IN_MB,MAX_STRING_LEN
 
   ! converts between adios and binary format for a model file like
diff --git a/src/tomography/difference_sem.f90 b/src/tomography/difference_sem.f90
index c015049..4e23a2b 100644
--- a/src/tomography/difference_sem.f90
+++ b/src/tomography/difference_sem.f90
@@ -37,7 +37,7 @@
 
 program difference_sem
 
-  use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,NX_BATHY,NY_BATHY,IIN,IOUT,MAX_STRING_LEN
+  use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,IIN,IOUT,MAX_STRING_LEN
 
   implicit none
 
diff --git a/src/tomography/interpolate_model.F90 b/src/tomography/interpolate_model.F90
index 6d34439..caebfa9 100644
--- a/src/tomography/interpolate_model.F90
+++ b/src/tomography/interpolate_model.F90
@@ -58,7 +58,7 @@
   program interpolate_model
 
   use constants,only: CUSTOM_REAL,SIZE_INTEGER,NGLLX,NGLLY,NGLLZ, &
-    TWO_PI,R_UNIT_SPHERE,NX_BATHY,NY_BATHY, &
+    TWO_PI,R_UNIT_SPHERE, &
     GAUSSALPHA,GAUSSBETA,NGNOD,MIDX,MIDY,MIDZ,R_EARTH_KM, &
     IIN,IOUT,IFLAG_CRUST,IFLAG_80_MOHO,IFLAG_220_80,IFLAG_670_220,IFLAG_MANTLE_NORMAL,MAX_STRING_LEN
 
diff --git a/src/tomography/smooth_sem.F90 b/src/tomography/smooth_sem.F90
index 25988d4..4c6c3a7 100644
--- a/src/tomography/smooth_sem.F90
+++ b/src/tomography/smooth_sem.F90
@@ -65,7 +65,7 @@ program smooth_sem_globe
 ! NOTE:  smoothing can be different in radial & horizontal directions; mesh is in spherical geometry.
 !              algorithm uses vector components in radial/horizontal direction
 
-  use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,NDIM,NX_BATHY,NY_BATHY,IIN,IOUT, &
+  use constants,only: CUSTOM_REAL,NGLLX,NGLLY,NGLLZ,NDIM,IIN,IOUT, &
     GAUSSALPHA,GAUSSBETA,PI,TWO_PI,R_EARTH_KM,MAX_STRING_LEN,DEGREES_TO_RADIANS,SIZE_INTEGER,NGLLCUBE
 
   use kdtree_search
diff --git a/src/tomography/tomography_par.f90 b/src/tomography/tomography_par.f90
index cef1c54..a55b3fd 100644
--- a/src/tomography/tomography_par.f90
+++ b/src/tomography/tomography_par.f90
@@ -28,7 +28,7 @@
 
 module tomography_par
 
-  use constants,only: CUSTOM_REAL,MAX_STRING_LEN,NX_BATHY,NY_BATHY, &
+  use constants,only: CUSTOM_REAL,MAX_STRING_LEN, &
     NGLLX,NGLLY,NGLLZ,IIN,IOUT, &
     FOUR_THIRDS,R_EARTH_KM,GAUSSALPHA,GAUSSBETA