[cig-commits] r20096 - in seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src: cuda generate_databases meshfem3D specfem3D
danielpeter at geodynamics.org
danielpeter at geodynamics.org
Sat May 12 06:10:31 PDT 2012
Author: danielpeter
Date: 2012-05-12 06:10:31 -0700 (Sat, 12 May 2012)
New Revision: 20096
Modified:
seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/cuda/prepare_mesh_constants_cuda.cu
seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/cuda/specfem3D_gpu_cuda_method_stubs.c
seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/generate_databases/generate_databases.f90
seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/meshfem3D/meshfem3D.f90
seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/compute_add_sources_elastic.f90
seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/compute_kernels.f90
seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/initialize_simulation.f90
seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/setup_sources_receivers.f90
Log:
updates error message outputs
Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/cuda/prepare_mesh_constants_cuda.cu
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/cuda/prepare_mesh_constants_cuda.cu 2012-05-12 02:13:21 UTC (rev 20095)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/cuda/prepare_mesh_constants_cuda.cu 2012-05-12 13:10:31 UTC (rev 20096)
@@ -104,7 +104,7 @@
//free(kernel_name);
#ifdef WITH_MPI
MPI_Abort(MPI_COMM_WORLD,1);
-#endif
+#endif
exit(EXIT_FAILURE);
}
}
Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/cuda/specfem3D_gpu_cuda_method_stubs.c
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/cuda/specfem3D_gpu_cuda_method_stubs.c 2012-05-12 02:13:21 UTC (rev 20095)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/cuda/specfem3D_gpu_cuda_method_stubs.c 2012-05-12 13:10:31 UTC (rev 20096)
@@ -1,4 +1,4 @@
-/*
+/*
!=====================================================================
!
! S p e c f e m 3 D V e r s i o n 2 . 0
@@ -33,51 +33,51 @@
typedef float realw;
-
+
//
// src/cuda/check_fields_cuda.cu
//
void FC_FUNC_(check_max_norm_displ_gpu,
- CHECK_MAX_NORM_DISPL_GPU)(int* size, realw* displ,long* Mesh_pointer_f,int* announceID) {}
+ CHECK_MAX_NORM_DISPL_GPU)(int* size, realw* displ,long* Mesh_pointer_f,int* announceID) {}
void FC_FUNC_(check_max_norm_vector,
- CHECK_MAX_NORM_VECTOR)(int* size, realw* vector1, int* announceID) {}
+ CHECK_MAX_NORM_VECTOR)(int* size, realw* vector1, int* announceID) {}
void FC_FUNC_(check_max_norm_displ,
- CHECK_MAX_NORM_DISPL)(int* size, realw* displ, int* announceID) {}
+ CHECK_MAX_NORM_DISPL)(int* size, realw* displ, int* announceID) {}
void FC_FUNC_(check_max_norm_b_displ_gpu,
- CHECK_MAX_NORM_B_DISPL_GPU)(int* size, realw* b_displ,long* Mesh_pointer_f,int* announceID) {}
+ CHECK_MAX_NORM_B_DISPL_GPU)(int* size, realw* b_displ,long* Mesh_pointer_f,int* announceID) {}
void FC_FUNC_(check_max_norm_b_accel_gpu,
- CHECK_MAX_NORM_B_ACCEL_GPU)(int* size, realw* b_accel,long* Mesh_pointer_f,int* announceID) {}
+ CHECK_MAX_NORM_B_ACCEL_GPU)(int* size, realw* b_accel,long* Mesh_pointer_f,int* announceID) {}
void FC_FUNC_(check_max_norm_b_veloc_gpu,
- CHECK_MAX_NORM_B_VELOC_GPU)(int* size, realw* b_veloc,long* Mesh_pointer_f,int* announceID) {}
+ CHECK_MAX_NORM_B_VELOC_GPU)(int* size, realw* b_veloc,long* Mesh_pointer_f,int* announceID) {}
void FC_FUNC_(check_max_norm_b_displ,
- CHECK_MAX_NORM_B_DISPL)(int* size, realw* b_displ,int* announceID) {}
+ CHECK_MAX_NORM_B_DISPL)(int* size, realw* b_displ,int* announceID) {}
void FC_FUNC_(check_max_norm_b_accel,
- CHECK_MAX_NORM_B_ACCEL)(int* size, realw* b_accel,int* announceID) {}
+ CHECK_MAX_NORM_B_ACCEL)(int* size, realw* b_accel,int* announceID) {}
void FC_FUNC_(check_error_vectors,
- CHECK_ERROR_VECTORS)(int* sizef, realw* vector1,realw* vector2) {}
+ CHECK_ERROR_VECTORS)(int* sizef, realw* vector1,realw* vector2) {}
void FC_FUNC_(get_max_accel,
- GET_MAX_ACCEL)(int* itf,int* sizef,long* Mesh_pointer) {}
+ GET_MAX_ACCEL)(int* itf,int* sizef,long* Mesh_pointer) {}
void FC_FUNC_(get_norm_acoustic_from_device,
GET_NORM_ACOUSTIC_FROM_DEVICE)(realw* norm,
long* Mesh_pointer_f,
- int* SIMULATION_TYPE) {}
+ int* SIMULATION_TYPE) {}
void FC_FUNC_(get_norm_elastic_from_device,
GET_NORM_ELASTIC_FROM_DEVICE)(realw* norm,
long* Mesh_pointer_f,
- int* SIMULATION_TYPE) {}
+ int* SIMULATION_TYPE) {}
//
@@ -90,7 +90,7 @@
int* NSOURCESf,
int* SIMULATION_TYPEf,
double* h_stf_pre_compute,
- int* myrankf) {}
+ int* myrankf) {}
void FC_FUNC_(compute_add_sources_ac_s3_cuda,
COMPUTE_ADD_SOURCES_AC_s3_CUDA)(long* Mesh_pointer_f,
@@ -98,7 +98,7 @@
int* NSOURCESf,
int* SIMULATION_TYPEf,
double* h_stf_pre_compute,
- int* myrankf) {}
+ int* myrankf) {}
void FC_FUNC_(add_sources_ac_sim_2_or_3_cuda,
ADD_SOURCES_AC_SIM_2_OR_3_CUDA)(long* Mesh_pointer,
@@ -112,7 +112,7 @@
int* time_index,
int* h_islice_selected_rec,
int* nadj_rec_local,
- int* NTSTEP_BETWEEN_READ_ADJSRC) {}
+ int* NTSTEP_BETWEEN_READ_ADJSRC) {}
//
@@ -124,21 +124,21 @@
int* phase_is_innerf,
int* NSOURCESf,
double* h_stf_pre_compute,
- int* myrankf) {}
+ int* myrankf) {}
void FC_FUNC_(compute_add_sources_el_s3_cuda,
COMPUTE_ADD_SOURCES_EL_S3_CUDA)(long* Mesh_pointer,
double* h_stf_pre_compute,
int* NSOURCESf,
int* phase_is_inner,
- int* myrank) {}
+ int* myrank) {}
void FC_FUNC_(add_source_master_rec_noise_cu,
ADD_SOURCE_MASTER_REC_NOISE_CU)(long* Mesh_pointer_f,
int* myrank_f,
int* it_f,
int* irec_master_noise_f,
- int* islice_selected_rec) {}
+ int* islice_selected_rec) {}
void FC_FUNC_(add_sources_el_sim_type_2_or_3,
ADD_SOURCES_EL_SIM_TYPE_2_OR_3)(long* Mesh_pointer,
@@ -152,7 +152,7 @@
int* time_index,
int* h_islice_selected_rec,
int* nadj_rec_local,
- int* NTSTEP_BETWEEN_READ_ADJSRC) {}
+ int* NTSTEP_BETWEEN_READ_ADJSRC) {}
//
@@ -163,13 +163,13 @@
COMPUTE_COUPLING_AC_EL_CUDA)(long* Mesh_pointer_f,
int* phase_is_innerf,
int* num_coupling_ac_el_facesf,
- int* SIMULATION_TYPEf) {}
+ int* SIMULATION_TYPEf) {}
void FC_FUNC_(compute_coupling_el_ac_cuda,
COMPUTE_COUPLING_EL_AC_CUDA)(long* Mesh_pointer_f,
int* phase_is_innerf,
int* num_coupling_ac_el_facesf,
- int* SIMULATION_TYPEf) {}
+ int* SIMULATION_TYPEf) {}
//
@@ -186,7 +186,7 @@
int* max_nibool_interfaces_ext_mesh,
int* nibool_interfaces_ext_mesh,
int* ibool_interfaces_ext_mesh,
- int* FORWARD_OR_ADJOINT){}
+ int* FORWARD_OR_ADJOINT){}
void FC_FUNC_(transfer_asmbl_pot_to_device,
TRANSFER_ASMBL_POT_TO_DEVICE)(
@@ -197,31 +197,31 @@
int* max_nibool_interfaces_ext_mesh,
int* nibool_interfaces_ext_mesh,
int* ibool_interfaces_ext_mesh,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(compute_forces_acoustic_cuda,
COMPUTE_FORCES_ACOUSTIC_CUDA)(long* Mesh_pointer_f,
int* iphase,
int* nspec_outer_acoustic,
int* nspec_inner_acoustic,
- int* SIMULATION_TYPE) {}
+ int* SIMULATION_TYPE) {}
void FC_FUNC_(kernel_3_a_acoustic_cuda,KERNEL_3_ACOUSTIC_CUDA)(
long* Mesh_pointer,
int* size_F,
- int* SIMULATION_TYPE) {}
+ int* SIMULATION_TYPE) {}
void FC_FUNC_(kernel_3_b_acoustic_cuda,KERNEL_3_ACOUSTIC_CUDA)(
long* Mesh_pointer,
int* size_F,
realw* deltatover2_F,
int* SIMULATION_TYPE,
- realw* b_deltatover2_F) {}
+ realw* b_deltatover2_F) {}
void FC_FUNC_(acoustic_enforce_free_surf_cuda,
ACOUSTIC_ENFORCE_FREE_SURF_CUDA)(long* Mesh_pointer_f,
int* SIMULATION_TYPE,
- int* ABSORB_FREE_SURFACE) {}
+ int* ABSORB_FREE_SURFACE) {}
//
@@ -235,7 +235,7 @@
int* max_nibool_interfaces_ext_mesh,
int* nibool_interfaces_ext_mesh,
int* ibool_interfaces_ext_mesh,
- int* FORWARD_OR_ADJOINT){}
+ int* FORWARD_OR_ADJOINT){}
void FC_FUNC_(transfer_asmbl_accel_to_device,
TRANSFER_ASMBL_ACCEL_TO_DEVICE)(long* Mesh_pointer, realw* accel,
@@ -244,7 +244,7 @@
int* max_nibool_interfaces_ext_mesh,
int* nibool_interfaces_ext_mesh,
int* ibool_interfaces_ext_mesh,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(compute_forces_elastic_cuda,
COMPUTE_FORCES_ELASTIC_CUDA)(long* Mesh_pointer_f,
@@ -254,7 +254,7 @@
int* SIMULATION_TYPE,
int* COMPUTE_AND_STORE_STRAIN,
int* ATTENUATION,
- int* ANISOTROPY) {}
+ int* ANISOTROPY) {}
void FC_FUNC_(kernel_3_a_cuda,
KERNEL_3_A_CUDA)(long* Mesh_pointer,
@@ -262,18 +262,18 @@
realw* deltatover2_F,
int* SIMULATION_TYPE_f,
realw* b_deltatover2_F,
- int* OCEANS) {}
+ int* OCEANS) {}
void FC_FUNC_(kernel_3_b_cuda,
KERNEL_3_B_CUDA)(long* Mesh_pointer,
int* size_F,
realw* deltatover2_F,
int* SIMULATION_TYPE_f,
- realw* b_deltatover2_F) {}
+ realw* b_deltatover2_F) {}
void FC_FUNC_(elastic_ocean_load_cuda,
ELASTIC_OCEAN_LOAD_CUDA)(long* Mesh_pointer_f,
- int* SIMULATION_TYPE) {}
+ int* SIMULATION_TYPE) {}
//
@@ -282,23 +282,23 @@
void FC_FUNC_(compute_kernels_elastic_cuda,
COMPUTE_KERNELS_ELASTIC_CUDA)(long* Mesh_pointer,
- realw* deltat_f) {}
+ realw* deltat_f) {}
void FC_FUNC_(compute_kernels_strgth_noise_cu,
COMPUTE_KERNELS_STRGTH_NOISE_CU)(long* Mesh_pointer,
realw* h_noise_surface_movie,
- realw* deltat) {}
+ realw* deltat) {}
void FC_FUNC_(compute_kernels_acoustic_cuda,
COMPUTE_KERNELS_ACOUSTIC_CUDA)(
long* Mesh_pointer,
- realw* deltat_f) {}
+ realw* deltat_f) {}
void FC_FUNC_(compute_kernels_hess_cuda,
COMPUTE_KERNELS_HESS_CUDA)(long* Mesh_pointer,
realw* deltat_f,
int* ELASTIC_SIMULATION,
- int* ACOUSTIC_SIMULATION) {}
+ int* ACOUSTIC_SIMULATION) {}
//
@@ -311,7 +311,7 @@
int* phase_is_innerf,
int* SIMULATION_TYPEf,
int* SAVE_FORWARDf,
- realw* h_b_absorb_potential) {}
+ realw* h_b_absorb_potential) {}
//
@@ -323,7 +323,7 @@
int* phase_is_innerf,
int* SIMULATION_TYPEf,
int* SAVE_FORWARDf,
- realw* h_b_absorb_field) {}
+ realw* h_b_absorb_field) {}
//
@@ -339,7 +339,7 @@
int* SIMULATION_TYPE,
realw* b_deltat_F,
realw* b_deltatsqover2_F,
- realw* b_deltatover2_F) {}
+ realw* b_deltatover2_F) {}
void FC_FUNC_(it_update_displacement_ac_cuda,
it_update_displacement_ac_cuda)(long* Mesh_pointer_f,
@@ -350,53 +350,53 @@
int* SIMULATION_TYPE,
realw* b_deltat_F,
realw* b_deltatsqover2_F,
- realw* b_deltatover2_F) {}
+ realw* b_deltatover2_F) {}
//
// src/cuda/noise_tomography_cuda.cu
//
-void FC_FUNC_(fortranflush,FORTRANFLUSH)(int* rank){}
+void FC_FUNC_(fortranflush,FORTRANFLUSH)(int* rank){}
-void FC_FUNC_(fortranprint,FORTRANPRINT)(int* id) {}
+void FC_FUNC_(fortranprint,FORTRANPRINT)(int* id) {}
-void FC_FUNC_(fortranprintf,FORTRANPRINTF)(realw* val) {}
+void FC_FUNC_(fortranprintf,FORTRANPRINTF)(realw* val) {}
-void FC_FUNC_(fortranprintd,FORTRANPRINTD)(double* val) {}
+void FC_FUNC_(fortranprintd,FORTRANPRINTD)(double* val) {}
-void FC_FUNC_(make_displ_rand,MAKE_DISPL_RAND)(long* Mesh_pointer_f,realw* h_displ) {}
+void FC_FUNC_(make_displ_rand,MAKE_DISPL_RAND)(long* Mesh_pointer_f,realw* h_displ) {}
void FC_FUNC_(transfer_surface_to_host,
TRANSFER_SURFACE_TO_HOST)(long* Mesh_pointer_f,
- realw* h_noise_surface_movie) {}
+ realw* h_noise_surface_movie) {}
void FC_FUNC_(noise_read_add_surface_movie_cu,
NOISE_READ_ADD_SURFACE_MOVIE_CU)(long* Mesh_pointer_f,
realw* h_noise_surface_movie,
- int* NOISE_TOMOGRAPHYf) {}
+ int* NOISE_TOMOGRAPHYf) {}
//
// src/cuda/prepare_mesh_constants_cuda.cu
//
-void FC_FUNC_(pause_for_debug,PAUSE_FOR_DEBUG)() {}
+void FC_FUNC_(pause_for_debug,PAUSE_FOR_DEBUG)() {}
void FC_FUNC_(output_free_device_memory,
- OUTPUT_FREE_DEVICE_MEMORY)(int* myrank) {}
+ OUTPUT_FREE_DEVICE_MEMORY)(int* myrank) {}
void FC_FUNC_(show_free_device_memory,
- SHOW_FREE_DEVICE_MEMORY)() {}
+ SHOW_FREE_DEVICE_MEMORY)() {}
void FC_FUNC_(get_free_device_memory,
- get_FREE_DEVICE_MEMORY)(realw* free, realw* used, realw* total ) {}
+ get_FREE_DEVICE_MEMORY)(realw* free, realw* used, realw* total ) {}
void FC_FUNC_(prepare_cuda_device,
- PREPARE_CUDA_DEVICE)(int* myrank_f,int* ncuda_devices) {
+ PREPARE_CUDA_DEVICE)(int* myrank_f,int* ncuda_devices) {
fprintf(stderr,"ERROR: GPU_MODE enabled without GPU/CUDA Support. To enable GPU support, reconfigure with --with-cuda flag.\n");
exit(1);
-}
+}
void FC_FUNC_(prepare_constants_device,
PREPARE_CONSTANTS_DEVICE)(long* Mesh_pointer,
@@ -431,7 +431,7 @@
int* nrec_local_f,
int* SIMULATION_TYPE,
int* USE_MESH_COLORING_GPU_f,
- int* nspec_acoustic,int* nspec_elastic) {}
+ int* nspec_acoustic,int* nspec_elastic) {}
void FC_FUNC_(prepare_fields_acoustic_device,
PREPARE_FIELDS_ACOUSTIC_DEVICE)(long* Mesh_pointer_f,
@@ -456,12 +456,12 @@
realw* coupling_ac_el_jacobian2Dw,
int* num_colors_outer_acoustic,
int* num_colors_inner_acoustic,
- int* num_elem_colors_acoustic) {}
+ int* num_elem_colors_acoustic) {}
void FC_FUNC_(prepare_fields_acoustic_adj_dev,
PREPARE_FIELDS_ACOUSTIC_ADJ_DEV)(long* Mesh_pointer_f,
int* SIMULATION_TYPE,
- int* APPROXIMATE_HESS_KL) {}
+ int* APPROXIMATE_HESS_KL) {}
void FC_FUNC_(prepare_fields_elastic_device,
PREPARE_FIELDS_ELASTIC_DEVICE)(long* Mesh_pointer_f,
@@ -516,7 +516,7 @@
realw *c46store,
realw *c55store,
realw *c56store,
- realw *c66store){}
+ realw *c66store){}
void FC_FUNC_(prepare_fields_elastic_adj_dev,
PREPARE_FIELDS_ELASTIC_ADJ_DEV)(long* Mesh_pointer_f,
@@ -531,7 +531,7 @@
int* R_size,
realw* b_R_xx,realw* b_R_yy,realw* b_R_xy,realw* b_R_xz,realw* b_R_yz,
realw* b_alphaval,realw* b_betaval,realw* b_gammaval,
- int* APPROXIMATE_HESS_KL){}
+ int* APPROXIMATE_HESS_KL){}
void FC_FUNC_(prepare_sim2_or_3_const_device,
PREPARE_SIM2_OR_3_CONST_DEVICE)(
@@ -540,7 +540,7 @@
int* islice_selected_rec_size,
int* nadj_rec_local,
int* nrec,
- int* myrank) {}
+ int* myrank) {}
void FC_FUNC_(prepare_fields_noise_device,
PREPARE_FIELDS_NOISE_DEVICE)(long* Mesh_pointer_f,
@@ -556,7 +556,7 @@
realw* normal_y_noise,
realw* normal_z_noise,
realw* mask_noise,
- realw* free_surface_jacobian2Dw) {}
+ realw* free_surface_jacobian2Dw) {}
void FC_FUNC_(prepare_fields_gravity_device,
PREPARE_FIELDS_gravity_DEVICE)(long* Mesh_pointer_f,
@@ -565,7 +565,7 @@
realw* minus_g,
realw* h_wgll_cube,
int* ACOUSTIC_SIMULATION,
- realw* rhostore) {}
+ realw* rhostore) {}
void FC_FUNC_(prepare_cleanup_device,
PREPARE_CLEANUP_DEVICE)(long* Mesh_pointer_f,
@@ -579,7 +579,7 @@
int* ATTENUATION,
int* ANISOTROPY,
int* OCEANS,
- int* APPROXIMATE_HESS_KL) {}
+ int* APPROXIMATE_HESS_KL) {}
//
@@ -587,41 +587,41 @@
//
void FC_FUNC_(transfer_fields_el_to_device,
- TRANSFER_FIELDS_EL_TO_DEVICE)(int* size, realw* displ, realw* veloc, realw* accel,long* Mesh_pointer_f) {}
+ TRANSFER_FIELDS_EL_TO_DEVICE)(int* size, realw* displ, realw* veloc, realw* accel,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_fields_el_from_device,
- TRANSFER_FIELDS_EL_FROM_DEVICE)(int* size, realw* displ, realw* veloc, realw* accel,long* Mesh_pointer_f) {}
+ TRANSFER_FIELDS_EL_FROM_DEVICE)(int* size, realw* displ, realw* veloc, realw* accel,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_b_fields_to_device,
TRANSFER_B_FIELDS_TO_DEVICE)(int* size, realw* b_displ, realw* b_veloc, realw* b_accel,
- long* Mesh_pointer_f) {}
+ long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_b_fields_from_device,
- TRANSFER_B_FIELDS_FROM_DEVICE)(int* size, realw* b_displ, realw* b_veloc, realw* b_accel,long* Mesh_pointer_f) {}
+ TRANSFER_B_FIELDS_FROM_DEVICE)(int* size, realw* b_displ, realw* b_veloc, realw* b_accel,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_accel_to_device,
- TRNASFER_ACCEL_TO_DEVICE)(int* size, realw* accel,long* Mesh_pointer_f) {}
+ TRNASFER_ACCEL_TO_DEVICE)(int* size, realw* accel,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_accel_from_device,
- TRANSFER_ACCEL_FROM_DEVICE)(int* size, realw* accel,long* Mesh_pointer_f) {}
+ TRANSFER_ACCEL_FROM_DEVICE)(int* size, realw* accel,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_b_accel_from_device,
- TRNASFER_B_ACCEL_FROM_DEVICE)(int* size, realw* b_accel,long* Mesh_pointer_f) {}
+ TRNASFER_B_ACCEL_FROM_DEVICE)(int* size, realw* b_accel,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_sigma_from_device,
- TRANSFER_SIGMA_FROM_DEVICE)(int* size, realw* sigma_kl,long* Mesh_pointer_f) {}
+ TRANSFER_SIGMA_FROM_DEVICE)(int* size, realw* sigma_kl,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_b_displ_from_device,
- TRANSFER_B_DISPL_FROM_DEVICE)(int* size, realw* displ,long* Mesh_pointer_f) {}
+ TRANSFER_B_DISPL_FROM_DEVICE)(int* size, realw* displ,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_displ_from_device,
- TRANSFER_DISPL_FROM_DEVICE)(int* size, realw* displ,long* Mesh_pointer_f) {}
+ TRANSFER_DISPL_FROM_DEVICE)(int* size, realw* displ,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_compute_kernel_answers_from_device,
TRANSFER_COMPUTE_KERNEL_ANSWERS_FROM_DEVICE)(long* Mesh_pointer,
realw* rho_kl,int* size_rho,
realw* mu_kl, int* size_mu,
- realw* kappa_kl, int* size_kappa) {}
+ realw* kappa_kl, int* size_kappa) {}
void FC_FUNC_(transfer_compute_kernel_fields_from_device,
TRANSFER_COMPUTE_KERNEL_FIELDS_FROM_DEVICE)(long* Mesh_pointer,
@@ -644,7 +644,7 @@
realw* kappa_kl, int* size_kappa,
realw* epsilon_trace_over_3,
realw* b_epsilon_trace_over_3,
- int* size_epsilon_trace_over_3) {}
+ int* size_epsilon_trace_over_3) {}
void FC_FUNC_(transfer_b_fields_att_to_device,
TRANSFER_B_FIELDS_ATT_TO_DEVICE)(long* Mesh_pointer,
@@ -655,7 +655,7 @@
realw* b_epsilondev_xy,
realw* b_epsilondev_xz,
realw* b_epsilondev_yz,
- int* size_epsilondev) {}
+ int* size_epsilondev) {}
void FC_FUNC_(transfer_fields_att_from_device,
TRANSFER_FIELDS_ATT_FROM_DEVICE)(long* Mesh_pointer,
@@ -666,19 +666,19 @@
realw* epsilondev_xy,
realw* epsilondev_xz,
realw* epsilondev_yz,
- int* size_epsilondev) {}
+ int* size_epsilondev) {}
void FC_FUNC_(transfer_kernels_el_to_host,
TRANSFER_KERNELS_EL_TO_HOST)(long* Mesh_pointer,
realw* h_rho_kl,
realw* h_mu_kl,
realw* h_kappa_kl,
- int* NSPEC_AB) {}
+ int* NSPEC_AB) {}
void FC_FUNC_(transfer_kernels_noise_to_host,
TRANSFER_KERNELS_NOISE_TO_HOST)(long* Mesh_pointer,
realw* h_Sigma_kl,
- int* NSPEC_AB) {}
+ int* NSPEC_AB) {}
void FC_FUNC_(transfer_fields_ac_to_device,
TRANSFER_FIELDS_AC_TO_DEVICE)(
@@ -686,7 +686,7 @@
realw* potential_acoustic,
realw* potential_dot_acoustic,
realw* potential_dot_dot_acoustic,
- long* Mesh_pointer_f) {}
+ long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_b_fields_ac_to_device,
TRANSFER_B_FIELDS_AC_TO_DEVICE)(
@@ -694,14 +694,14 @@
realw* b_potential_acoustic,
realw* b_potential_dot_acoustic,
realw* b_potential_dot_dot_acoustic,
- long* Mesh_pointer_f) {}
+ long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_fields_ac_from_device,
TRANSFER_FIELDS_AC_FROM_DEVICE)(int* size,
realw* potential_acoustic,
realw* potential_dot_acoustic,
realw* potential_dot_dot_acoustic,
- long* Mesh_pointer_f) {}
+ long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_b_fields_ac_from_device,
TRANSFER_B_FIELDS_AC_FROM_DEVICE)(
@@ -709,29 +709,29 @@
realw* b_potential_acoustic,
realw* b_potential_dot_acoustic,
realw* b_potential_dot_dot_acoustic,
- long* Mesh_pointer_f) {}
+ long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_dot_dot_from_device,
- TRNASFER_DOT_DOT_FROM_DEVICE)(int* size, realw* potential_dot_dot_acoustic,long* Mesh_pointer_f) {}
+ TRNASFER_DOT_DOT_FROM_DEVICE)(int* size, realw* potential_dot_dot_acoustic,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_b_dot_dot_from_device,
- TRNASFER_B_DOT_DOT_FROM_DEVICE)(int* size, realw* b_potential_dot_dot_acoustic,long* Mesh_pointer_f) {}
+ TRNASFER_B_DOT_DOT_FROM_DEVICE)(int* size, realw* b_potential_dot_dot_acoustic,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_kernels_ac_to_host,
TRANSFER_KERNELS_AC_TO_HOST)(long* Mesh_pointer,
realw* h_rho_ac_kl,
realw* h_kappa_ac_kl,
- int* NSPEC_AB) {}
+ int* NSPEC_AB) {}
void FC_FUNC_(transfer_kernels_hess_el_tohost,
TRANSFER_KERNELS_HESS_EL_TOHOST)(long* Mesh_pointer,
realw* h_hess_kl,
- int* NSPEC_AB) {}
+ int* NSPEC_AB) {}
void FC_FUNC_(transfer_kernels_hess_ac_tohost,
TRANSFER_KERNELS_HESS_AC_TOHOST)(long* Mesh_pointer,
realw* h_hess_ac_kl,
- int* NSPEC_AB) {}
+ int* NSPEC_AB) {}
//
@@ -743,7 +743,7 @@
realw* b_displ, realw* b_veloc, realw* b_accel,
long* Mesh_pointer_f,int* number_receiver_global,
int* ispec_selected_rec,int* ispec_selected_source,
- int* ibool,int* SIMULATION_TYPEf) {}
+ int* ibool,int* SIMULATION_TYPEf) {}
void FC_FUNC_(transfer_station_ac_from_device,
TRANSFER_STATION_AC_FROM_DEVICE)(
@@ -758,5 +758,5 @@
int* ispec_selected_rec,
int* ispec_selected_source,
int* ibool,
- int* SIMULATION_TYPEf) {}
+ int* SIMULATION_TYPEf) {}
Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/generate_databases/generate_databases.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/generate_databases/generate_databases.f90 2012-05-12 02:13:21 UTC (rev 20095)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/generate_databases/generate_databases.f90 2012-05-12 13:10:31 UTC (rev 20096)
@@ -386,7 +386,11 @@
if(sizeprocs /= NPROC) then
if( myrank == 0 ) then
write(IMAIN,*) 'error: number of processors supposed to run on: ',NPROC
- write(IMAIN,*) 'error: number of processors actually run on: ',sizeprocs
+ write(IMAIN,*) 'error: number of MPI processors actually run on: ',sizeprocs
+ print*
+ print*, 'error: number of processors supposed to run on: ',NPROC
+ print*, 'error: number of MPI processors actually run on: ',sizeprocs
+ print*
endif
call exit_MPI(myrank,'wrong number of MPI processes')
endif
Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/meshfem3D/meshfem3D.f90 2012-05-12 02:13:21 UTC (rev 20095)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/meshfem3D/meshfem3D.f90 2012-05-12 13:10:31 UTC (rev 20096)
@@ -401,7 +401,14 @@
! check that the code is running with the requested nb of processes
if(sizeprocs /= NPROC) then
- print*,'error requested nproc',NPROC,'not equal to size proc',sizeprocs
+ if( myrank == 0 ) then
+ write(IMAIN,*) 'error: number of processors supposed to run on: ',NPROC
+ write(IMAIN,*) 'error: number of MPI processors actually run on: ',sizeprocs
+ print*
+ print*, 'error: number of processors supposed to run on: ',NPROC
+ print*, 'error: number of MPI processors actually run on: ',sizeprocs
+ print*
+ endif
call exit_MPI(myrank,'wrong number of MPI processes')
endif
Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/compute_add_sources_elastic.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/compute_add_sources_elastic.f90 2012-05-12 02:13:21 UTC (rev 20095)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/compute_add_sources_elastic.f90 2012-05-12 13:10:31 UTC (rev 20096)
@@ -129,7 +129,7 @@
do isource = 1,NSOURCES
if( USE_RICKER_IPATI ) then
stf_pre_compute(isource) = comp_source_time_function_rickr( &
- dble(it-1)*DT-t0-tshift_cmt(isource),hdur(isource))
+ dble(it-1)*DT-t0-tshift_cmt(isource),hdur(isource))
else
stf_pre_compute(isource) = comp_source_time_function( &
dble(it-1)*DT-t0-tshift_cmt(isource),hdur_gaussian(isource))
@@ -188,7 +188,7 @@
else
stf = comp_source_time_function(dble(it-1)*DT-t0-tshift_cmt(isource),hdur_gaussian(isource))
endif
-
+
! distinguish between single and double precision for reals
if(CUSTOM_REAL == SIZE_REAL) then
stf_used = sngl(stf)
@@ -452,7 +452,7 @@
stf = comp_source_time_function( &
dble(NSTEP-it)*DT-t0-tshift_cmt(isource),hdur_gaussian(isource))
endif
-
+
! distinguish between single and double precision for reals
if(CUSTOM_REAL == SIZE_REAL) then
stf_used = sngl(stf)
Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/compute_kernels.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/compute_kernels.f90 2012-05-12 02:13:21 UTC (rev 20095)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/compute_kernels.f90 2012-05-12 13:10:31 UTC (rev 20096)
@@ -208,7 +208,7 @@
do j = 1, NGLLY
do i = 1, NGLLX
iglob = ibool(i,j,k,ispec)
-
+
! new expression
! density kernel
rhol = rhostore(i,j,k,ispec)
Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/initialize_simulation.f90 2012-05-12 02:13:21 UTC (rev 20095)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/initialize_simulation.f90 2012-05-12 13:10:31 UTC (rev 20096)
@@ -193,7 +193,17 @@
call world_size(sizeprocs)
! check that the code is running with the requested nb of processes
- if(sizeprocs /= NPROC) call exit_MPI(myrank,'wrong number of MPI processes')
+ if(sizeprocs /= NPROC) then
+ if( myrank == 0 ) then
+ write(IMAIN,*) 'error: number of processors supposed to run on: ',NPROC
+ write(IMAIN,*) 'error: number of MPI processors actually run on: ',sizeprocs
+ print*
+ print*, 'error: number of processors supposed to run on: ',NPROC
+ print*, 'error: number of MPI processors actually run on: ',sizeprocs
+ print*
+ endif
+ call exit_MPI(myrank,'wrong number of MPI processes')
+ endif
! check that we have at least one source
if(NSOURCES < 1) call exit_MPI(myrank,'need at least one source')
Modified: seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/setup_sources_receivers.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/setup_sources_receivers.f90 2012-05-12 02:13:21 UTC (rev 20095)
+++ seismo/3D/SPECFEM3D/branches/SPECFEM3D_SUNFLOWER/src/specfem3D/setup_sources_receivers.f90 2012-05-12 13:10:31 UTC (rev 20096)
@@ -129,7 +129,7 @@
! note: an earlier start time also reduces numerical noise due to a
! non-zero offset at the beginning of the source time function
t0 = - 2.0d0 * minval(tshift_cmt(:) - hdur(:)) ! - 1.5d0 * minval(tshift_cmt-hdur)
-
+
! uses an earlier start time if source is acoustic with a gaussian source time function
t0_acoustic = 0.0d0
do isource = 1,NSOURCES
More information about the CIG-COMMITS
mailing list