[cig-commits] [commit] devel, master: Clean up C code slightly. (7db6445)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:19:53 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit 7db64456d9e43337bcc602bd118ff82dcd64a4fc
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat May 31 00:04:14 2014 -0400
Clean up C code slightly.
>---------------------------------------------------------------
7db64456d9e43337bcc602bd118ff82dcd64a4fc
src/shared/adios_method_stubs.c | 69 +++----
src/shared/write_c_binary.c | 117 ++----------
src/specfem3D/file_io_threads.c | 1 -
src/specfem3D/specfem3D_gpu_method_stubs.c | 283 +++++++++++++++--------------
4 files changed, 199 insertions(+), 271 deletions(-)
diff --git a/src/shared/adios_method_stubs.c b/src/shared/adios_method_stubs.c
index 81ffe68..bb2ae78 100644
--- a/src/shared/adios_method_stubs.c
+++ b/src/shared/adios_method_stubs.c
@@ -36,14 +36,17 @@ typedef float realw;
// placeholders for non-adios compilation
-void warn_no_adios() {
- fprintf(stderr,"ERROR: ADIOS enabled without ADIOS Support. To enable ADIOS support, reconfigure with --with-adios flag.\n");
- exit(1);
+void
+warn_no_adios(void)
+{
+ fprintf(stderr, "ERROR: ADIOS enabled without ADIOS Support. "
+ "To enable ADIOS support, reconfigure with --with-adios flag.\n");
+ exit(1);
}
-void FC_FUNC_(adios_setup,ADIOS_SETUP)(){ warn_no_adios(); }
+void FC_FUNC_(adios_setup,ADIOS_SETUP)(void) { warn_no_adios(); }
-void FC_FUNC_(adios_cleanup,ADIOS_CLEANUP)(){}
+void FC_FUNC_(adios_cleanup,ADIOS_CLEANUP)(void){}
@@ -63,66 +66,66 @@ void FC_FUNC_(save_arrays_solver_adios,SAVE_ARRAYS_SOLVER_ADIOS)(int* myrank, in
int* NSPEC2DMAX_XMIN_XMAX, int* NSPEC2DMAX_YMIN_YMAX,
int* NSPEC2D_TOP, int* NSPEC2D_BOTTOM){}
-void FC_FUNC_(save_arrays_solver_meshfiles_adios,SAVE_ARRAYS_SOLVER_MESHFILES_ADIOS)(){}
+void FC_FUNC_(save_arrays_solver_meshfiles_adios,SAVE_ARRAYS_SOLVER_MESHFILES_ADIOS)(void){}
-void FC_FUNC_(save_arrays_solver_boundary_adios,SAVE_ARRAYS_SOLVER_BOUNDARY_ADIOS)(){}
+void FC_FUNC_(save_arrays_solver_boundary_adios,SAVE_ARRAYS_SOLVER_BOUNDARY_ADIOS)(void){}
-void FC_FUNC_(save_mpi_arrays_adios,SAVE_MPI_ARRAYS_ADIOS)(){}
+void FC_FUNC_(save_mpi_arrays_adios,SAVE_MPI_ARRAYS_ADIOS)(void){}
-void FC_FUNC_(read_gll_model_adios,READ_GLL_MODEL_ADIOS)(){}
+void FC_FUNC_(read_gll_model_adios,READ_GLL_MODEL_ADIOS)(void){}
// for xspecfem3D compilation
-void FC_FUNC_(read_arrays_solver_adios,READ_ARRAYS_SOLVER_ADIOS)(){}
+void FC_FUNC_(read_arrays_solver_adios,READ_ARRAYS_SOLVER_ADIOS)(void){}
-void FC_FUNC_(read_attenuation_adios,READ_ATTENUATION_ADIOS)(){}
+void FC_FUNC_(read_attenuation_adios,READ_ATTENUATION_ADIOS)(void){}
-void FC_FUNC_(read_forward_arrays_adios,READ_FORWARD_ARRAYS_ADIOS)(){}
+void FC_FUNC_(read_forward_arrays_adios,READ_FORWARD_ARRAYS_ADIOS)(void){}
-void FC_FUNC_(read_intermediate_forward_arrays_adios,READ_INTERMEDIATE_FORWARD_ARRAYS_ADIOS)(){}
+void FC_FUNC_(read_intermediate_forward_arrays_adios,READ_INTERMEDIATE_FORWARD_ARRAYS_ADIOS)(void){}
-void FC_FUNC_(read_mesh_databases_coupling_adios,READ_MESH_DATABASES_COUPLING_ADIOS)(){}
+void FC_FUNC_(read_mesh_databases_coupling_adios,READ_MESH_DATABASES_COUPLING_ADIOS)(void){}
-void FC_FUNC_(read_mesh_databases_mpi_cm_adios,READ_MESH_DATABASES_MPI_CM_ADIOS)(){}
+void FC_FUNC_(read_mesh_databases_mpi_cm_adios,READ_MESH_DATABASES_MPI_CM_ADIOS)(void){}
-void FC_FUNC_(read_mesh_databases_mpi_ic_adios,READ_MESH_DATABASES_MPI_IC_ADIOS)(){}
+void FC_FUNC_(read_mesh_databases_mpi_ic_adios,READ_MESH_DATABASES_MPI_IC_ADIOS)(void){}
-void FC_FUNC_(read_mesh_databases_mpi_oc_adios,READ_MESH_DATABASES_MPI_OC_ADIOS)(){}
+void FC_FUNC_(read_mesh_databases_mpi_oc_adios,READ_MESH_DATABASES_MPI_OC_ADIOS)(void){}
-void FC_FUNC_(read_mesh_databases_stacey_adios,READ_MESH_DATABASES_STACEY_ADIOS)(){}
+void FC_FUNC_(read_mesh_databases_stacey_adios,READ_MESH_DATABASES_STACEY_ADIOS)(void){}
-void FC_FUNC_(save_forward_arrays_adios,SAVE_FORWARD_ARRAYS_ADIOS)(){}
+void FC_FUNC_(save_forward_arrays_adios,SAVE_FORWARD_ARRAYS_ADIOS)(void){}
-void FC_FUNC_(save_intermediate_forward_arrays_adios,SAVE_INTERMEDIATE_FORWARD_ARRAYS_ADIOS)(){}
+void FC_FUNC_(save_intermediate_forward_arrays_adios,SAVE_INTERMEDIATE_FORWARD_ARRAYS_ADIOS)(void){}
-void FC_FUNC_(perform_write_adios_kernels,PERFORM_WRITE_ADIOS_KERNELS)(){}
+void FC_FUNC_(perform_write_adios_kernels,PERFORM_WRITE_ADIOS_KERNELS)(void){}
-void FC_FUNC_(define_kernel_adios_variables,DEFINE_KERNEL_ADIOS_VARIABLES)(){}
+void FC_FUNC_(define_kernel_adios_variables,DEFINE_KERNEL_ADIOS_VARIABLES)(void){}
-void FC_FUNC_(write_kernels_crust_mantle_adios,WRITE_KERNELS_CRUST_MANTLE_ADIOS)(){}
+void FC_FUNC_(write_kernels_crust_mantle_adios,WRITE_KERNELS_CRUST_MANTLE_ADIOS)(void){}
-void FC_FUNC_(write_kernels_outer_core_adios,WRITE_KERNELS_OUTER_CORE_ADIOS)(){}
+void FC_FUNC_(write_kernels_outer_core_adios,WRITE_KERNELS_OUTER_CORE_ADIOS)(void){}
-void FC_FUNC_(write_kernels_inner_core_adios,WRITE_KERNELS_INNER_CORE_ADIOS)(){}
+void FC_FUNC_(write_kernels_inner_core_adios,WRITE_KERNELS_INNER_CORE_ADIOS)(void){}
-void FC_FUNC_(write_kernels_boundary_kl_adios,WRITE_KERNELS_BOUNDARY_KL_ADIOS)(){}
+void FC_FUNC_(write_kernels_boundary_kl_adios,WRITE_KERNELS_BOUNDARY_KL_ADIOS)(void){}
-void FC_FUNC_(write_kernels_source_derivatives_adios,WRITE_KERNELS_SOURCE_DERIVATIVES_ADIOS)(){}
+void FC_FUNC_(write_kernels_source_derivatives_adios,WRITE_KERNELS_SOURCE_DERIVATIVES_ADIOS)(void){}
-void FC_FUNC_(write_kernels_hessian_adios,WRITE_KERNELS_HESSIAN_ADIOS)(){}
+void FC_FUNC_(write_kernels_hessian_adios,WRITE_KERNELS_HESSIAN_ADIOS)(void){}
// For xspecfem3d -- "ASDF" -- seismograms in ADIOS
-void FC_FUNC_(init_asdf_data, INIT_ASDF_DATA)(void* asdf_event,
+void FC_FUNC_(init_asdf_data,INIT_ASDF_DATA)(void* asdf_event,
int* total_seismos_local){}
-void FC_FUNC_(store_asdf_data, STORE_ASDF_DATA)
+void FC_FUNC_(store_asdf_data,STORE_ASDF_DATA)
(void* my_asdf, realw* seismogram_tmp, int* irec_local, int *irec,
char* chn, int* iorientation){}
-void FC_FUNC_(close_asdf_data, CLOSE_ASDF_DATA)(void *my_asdf,
- int *total_seismos_local){}
+void FC_FUNC_(close_asdf_data,CLOSE_ASDF_DATA)(void *my_asdf,
+ int *total_seismos_local){}
-void FC_FUNC_(write_asdf, WRITE_ASDF)(void* my_asdf){}
+void FC_FUNC_(write_asdf,WRITE_ASDF)(void* my_asdf){}
diff --git a/src/shared/write_c_binary.c b/src/shared/write_c_binary.c
index b04a410..1724795 100644
--- a/src/shared/write_c_binary.c
+++ b/src/shared/write_c_binary.c
@@ -30,8 +30,6 @@
// for large files
#define _FILE_OFFSET_BITS 64
-// after Brian's function
-
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
@@ -44,7 +42,6 @@ static int fd;
void
FC_FUNC_(open_file_create,OPEN_FILE)(char *file) {
- /* fprintf(stderr, "Opening file: %s\n", file); */
fd = open(file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if(fd == -1) {
fprintf(stderr, "Error opening file: %s exiting\n", file);
@@ -54,7 +51,6 @@ FC_FUNC_(open_file_create,OPEN_FILE)(char *file) {
void
FC_FUNC_(open_file_append,OPEN_FILE)(char *file) {
- /* fprintf(stderr, "Opening file: %s\n", file); */
fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0644);
if(fd == -1) {
fprintf(stderr, "Error opening file: %s exiting\n", file);
@@ -64,7 +60,6 @@ FC_FUNC_(open_file_append,OPEN_FILE)(char *file) {
void
FC_FUNC_(close_file,CLOSE_FILE)() {
- /* fprintf(stderr, "Closing file\n"); */
close(fd);
}
@@ -78,7 +73,6 @@ FC_FUNC_(write_real,WRITE_REAL)(float *z) {
int dummy_unused_variable = write(fd, z, sizeof(float));
}
-/* BS BS begin. Added section for writing SAC binary data*/
void
FC_FUNC_(write_n_real,WRITE_N_REAL)(float *z,int *n) {
int dummy_unused_variable = write(fd, z, *n*sizeof(float));
@@ -89,11 +83,8 @@ FC_FUNC_(write_character,WRITE_CHARACTER)(char *z, int *lchar) {
int dummy_unused_variable = write(fd, z, *lchar*sizeof(char));
}
-// LQY -- added for combine_vol/surf_data to write multiple binary files simultaneously --
-
void
FC_FUNC_(open_file_fd,OPEN_FILE_FD)(char *file, int *pfd) {
- /* fprintf(stderr, "Opening file: %s\n", file); */
*pfd = open(file, O_WRONLY | O_CREAT, 0644);
if(*pfd == -1) {
fprintf(stderr, "Error opening file: %s exiting\n", file);
@@ -103,7 +94,6 @@ FC_FUNC_(open_file_fd,OPEN_FILE_FD)(char *file, int *pfd) {
void
FC_FUNC_(close_file_fd,CLOSE_FILE_FD)(int *pfd) {
- /* fprintf(stderr, "Closing file\n"); */
close(*pfd);
}
@@ -117,7 +107,6 @@ FC_FUNC_(write_real_fd,WRITE_REAL_FD)(int *pfd, float *z) {
int dummy_unused_variable = write(*pfd, z, sizeof(float));
}
-/* BS BS begin. Added section for writing SAC binary data*/
void
FC_FUNC_(write_n_real_fd,WRITE_N_REAL_FD)(int *pfd, float *z,int *n) {
int dummy_unused_variable = write(*pfd, z, *n*sizeof(float));
@@ -144,7 +133,6 @@ FC_FUNC_(write_character_fd,WRITE_CHARACTER_FD)(int *pfd, char *z, int *lchar) {
#define __USE_GNU
#include <string.h>
-#include <regex.h>
#define MIN(x,y) ((x) < (y) ? (x) : (y))
@@ -171,10 +159,7 @@ static FILE * fp_abs[ABS_FILEID];
static char * work_buffer[ABS_FILEID];
-//void
-//FC_FUNC_(open_file_abs_r_fbin,OPEN_FILE_ABS_R_FBIN)(int *fid, char *filename,int *length, int *filesize){
void open_file_abs_r_fbin(int *fid, char *filename,int *length, long long *filesize){
-
// opens file for read access
//This sequence assigns the MAX_B array work_buffer to the file pointer
@@ -215,10 +200,7 @@ void open_file_abs_r_fbin(int *fid, char *filename,int *length, long long *files
free(fncopy);
}
-//void
-//FC_FUNC_(open_file_abs_w_fbin,OPEN_FILE_ABS_W_FBIN)(int *fid, char *filename, int *length, int *filesize){
void open_file_abs_w_fbin(int *fid, char *filename, int *length, long long *filesize){
-
// opens file for write access
//This sequence assigns the MAX_B array work_buffer to the file pointer
@@ -257,73 +239,51 @@ void open_file_abs_w_fbin(int *fid, char *filename, int *length, long long *file
fp_abs[*fid] = ft;
free(fncopy);
-
}
-//void
-//FC_FUNC_(close_file_abs_fbin,CLOSE_FILE_ABS_FBIN)(int * fid){
void close_file_abs_fbin(int * fid){
-
// closes file
fclose(fp_abs[*fid]);
free(work_buffer[*fid]);
-
}
-//void
-//FC_FUNC_(write_abs_fbin,WRITE_ABS_FBIN)(int *fid, void *buffer, int *length, int *index){
void write_abs_fbin(int *fid, char *buffer, int *length, int *index){
-
// writes binary file data in chunks of MAX_B
FILE *ft;
int itemlen,remlen,donelen,ret;
-// DK DK fixed the warning we got when compiling with Intel icc
-// DK DK solution found at http://osdir.com/ml/network.quagga.devel/2004-09/msg00090.html
-// DK DK void *buf;
- char *buf = NULL;
// file pointer
ft = fp_abs[*fid];
donelen = 0;
remlen = *length;
- buf = buffer;
ret = 0;
// writes items of maximum MAX_B to the file
while (remlen > 0){
itemlen = MIN(remlen,MAX_B);
- ret = fwrite(buf,1,itemlen,ft);
+ ret = fwrite(buffer,1,itemlen,ft);
if (ret > 0){
donelen = donelen + ret;
remlen = remlen - MAX_B;
- // this shifts the pointer position, thus is used in arithmetic, compilers might warn about this...
- buf += MAX_B;
+ buffer += MAX_B;
}
else{
remlen = 0;
}
}
-
}
-//void
-//FC_FUNC_(read_abs_fbin,READ_ABS_FBIN)(int *fid, void *buffer, int *length, int *index){
void read_abs_fbin(int *fid, char *buffer, int *length, int *index){
-
// reads binary file data in chunks of MAX_B
FILE *ft;
int ret,itemlen,remlen,donelen;
long long pos;
-// DK DK fixed the warning we got when compiling with Intel icc
-// DK DK solution found at http://osdir.com/ml/network.quagga.devel/2004-09/msg00090.html
-// DK DK void *buf;
- char *buf = NULL;
// file pointer
ft = fp_abs[*fid];
@@ -339,7 +299,6 @@ void read_abs_fbin(int *fid, char *buffer, int *length, int *index){
donelen = 0;
remlen = *length;
- buf = buffer;
ret = 0;
// reads items of maximum MAX_B to the file
@@ -349,21 +308,19 @@ void read_abs_fbin(int *fid, char *buffer, int *length, int *index){
if (ferror(ft) || feof(ft)) return;
itemlen = MIN(remlen,MAX_B);
- ret = fread(buf,1,itemlen,ft);
+ ret = fread(buffer,1,itemlen,ft);
if (ferror(ft) || feof(ft)) return;
if (ret > 0){
donelen = donelen + ret;
remlen = remlen - MAX_B;
- // this shifts the pointer position, thus is used in arithmetic, compilers might warn about this...
- buf += MAX_B;
+ buffer += MAX_B;
}
else{
remlen = 0;
}
}
-
}
@@ -405,12 +362,8 @@ static int map_fd_abs[ABS_FILEID];
// file sizes
static long long filesize_abs[ABS_FILEID];
-//void
-//FC_FUNC_(open_file_abs_w_map,OPEN_FILE_ABS_W_MAP)(int *fid, char *filename, int *length, int *filesize){
void open_file_abs_w_map(int *fid, char *filename, int *length, long long *filesize){
-
// opens file for write access
-
int ft;
int result;
char *map;
@@ -457,9 +410,6 @@ void open_file_abs_w_map(int *fid, char *filename, int *length, long long *files
exit(EXIT_FAILURE);
}
- //printf("file length: %d \n",filesize_abs[*fid]);
-
-
/* Something needs to be written at the end of the file to
* have the file actually have the new size.
* Just writing an empty string at the current file position will do.
@@ -487,15 +437,9 @@ void open_file_abs_w_map(int *fid, char *filename, int *length, long long *files
}
map_abs[*fid] = map;
-
- //printf("file map: %d\n",*fid);
-
}
-//void
-//FC_FUNC_(open_file_abs_r_map,OPEN_FILE_ABS_R_MAP)(int *fid, char *filename,int *length, int *filesize){
void open_file_abs_r_map(int *fid, char *filename,int *length, long long *filesize){
-
// opens file for read access
char * fncopy;
char * blank;
@@ -515,7 +459,6 @@ void open_file_abs_r_map(int *fid, char *filename,int *length, long long *filesi
fncopy[blank - fncopy] = '\0';
}
-
ft = open(fncopy, O_RDONLY);
if (ft == -1) {
perror("Error opening file for reading");
@@ -537,17 +480,10 @@ void open_file_abs_r_map(int *fid, char *filename,int *length, long long *filesi
}
map_abs[*fid] = map;
-
- //printf("file length r: %d \n",filesize_abs[*fid]);
- //printf("file map r: %d\n",*fid);
-
}
-//void
-//FC_FUNC_(close_file_abs_map,CLOSE_FILE_ABS_MAP)(int * fid){
void close_file_abs_map(int * fid){
-
/* Don't forget to free the mmapped memory
*/
if (munmap(map_abs[*fid], filesize_abs[*fid]) == -1) {
@@ -561,10 +497,7 @@ void close_file_abs_map(int * fid){
}
-//void
-//FC_FUNC_(write_abs_map,WRITE_ABS_MAP)(int *fid, char *buffer, int *length , int *index){
void write_abs_map(int *fid, char *buffer, int *length , int *index){
-
char *map;
long long offset;
@@ -574,14 +507,10 @@ void write_abs_map(int *fid, char *buffer, int *length , int *index){
offset = ((long long)*index -1 ) * (*length) ;
// copies buffer to map
- memcpy( &map[offset], buffer ,*length );
-
+ memcpy( &map[offset], buffer, *length );
}
-//void
-//FC_FUNC_(read_abs_map,READ_ABS_MAP)(int *fid, char *buffer, int *length , int *index){
void read_abs_map(int *fid, char *buffer, int *length , int *index){
-
char *map;
long long offset;
@@ -592,7 +521,6 @@ void read_abs_map(int *fid, char *buffer, int *length , int *index){
// copies map to buffer
memcpy( buffer, &map[offset], *length );
-
}
@@ -614,57 +542,52 @@ wrapper functions
*/
void
-FC_FUNC_(open_file_abs_w,OPEN_FILE_ABS_W)(int *fid, char *filename,int *length, long long *filesize) {
-
-#ifdef USE_MAP_FUNCTION
+FC_FUNC_(open_file_abs_w,OPEN_FILE_ABS_W)(int *fid, char *filename,int *length, long long *filesize)
+{
+#ifdef USE_MAP_FUNCTION
open_file_abs_w_map(fid,filename,length,filesize);
#else
open_file_abs_w_fbin(fid,filename,length,filesize);
#endif
-
}
void
-FC_FUNC_(open_file_abs_r,OPEN_FILE_ABS_R)(int *fid, char *filename,int *length, long long *filesize) {
-
-#ifdef USE_MAP_FUNCTION
+FC_FUNC_(open_file_abs_r,OPEN_FILE_ABS_R)(int *fid, char *filename,int *length, long long *filesize)
+{
+#ifdef USE_MAP_FUNCTION
open_file_abs_r_map(fid,filename,length,filesize);
#else
open_file_abs_r_fbin(fid,filename,length,filesize);
#endif
-
}
void
-FC_FUNC_(close_file_abs,CLOSE_FILES_ABS)(int *fid) {
-
-#ifdef USE_MAP_FUNCTION
+FC_FUNC_(close_file_abs,CLOSE_FILES_ABS)(int *fid)
+{
+#ifdef USE_MAP_FUNCTION
close_file_abs_map(fid);
#else
close_file_abs_fbin(fid);
#endif
-
}
void
-FC_FUNC_(write_abs,WRITE_ABS)(int *fid, char *buffer, int *length , int *index) {
-
-#ifdef USE_MAP_FUNCTION
+FC_FUNC_(write_abs,WRITE_ABS)(int *fid, char *buffer, int *length , int *index)
+{
+#ifdef USE_MAP_FUNCTION
write_abs_map(fid,buffer,length,index);
#else
write_abs_fbin(fid,buffer,length,index);
#endif
-
}
void
-FC_FUNC_(read_abs,READ_ABS)(int *fid, char *buffer, int *length , int *index) {
-
-#ifdef USE_MAP_FUNCTION
+FC_FUNC_(read_abs,READ_ABS)(int *fid, char *buffer, int *length , int *index)
+{
+#ifdef USE_MAP_FUNCTION
read_abs_map(fid,buffer,length,index);
#else
read_abs_fbin(fid,buffer,length,index);
#endif
-
}
diff --git a/src/specfem3D/file_io_threads.c b/src/specfem3D/file_io_threads.c
index 7b03d43..cdb5051 100644
--- a/src/specfem3D/file_io_threads.c
+++ b/src/specfem3D/file_io_threads.c
@@ -146,7 +146,6 @@ FC_FUNC_(prepare_adj_io_thread,CREATE_IO_ADJ_THREAD)(char *buffer, long* length,
TRACE("prepare_adj_io_thread");
- int rc;
size_t bytes_to_read = *length;
// checks if buffer valid
diff --git a/src/specfem3D/specfem3D_gpu_method_stubs.c b/src/specfem3D/specfem3D_gpu_method_stubs.c
index de61dd7..343d9b7 100644
--- a/src/specfem3D/specfem3D_gpu_method_stubs.c
+++ b/src/specfem3D/specfem3D_gpu_method_stubs.c
@@ -34,8 +34,6 @@
typedef float realw;
-
-
//
// src/gpu/assemble_MPI_scalar_gpu.cu
//
@@ -57,9 +55,9 @@ void FC_FUNC_(transfer_asmbl_pot_to_device,
void FC_FUNC_(transfer_boun_from_device,
TRANSFER_BOUN_FROM_DEVICE)(long* Mesh_pointer_f,
- realw* send_accel_buffer,
- int* IREGION,
- int* FORWARD_OR_ADJOINT){}
+ realw* send_accel_buffer,
+ int* IREGION,
+ int* FORWARD_OR_ADJOINT){}
void FC_FUNC_(transfer_asmbl_accel_to_device,
TRANSFER_ASMBL_ACCEL_TO_DEVICE)(long* Mesh_pointer,
@@ -69,16 +67,16 @@ void FC_FUNC_(transfer_asmbl_accel_to_device,
void FC_FUNC_(transfer_buffer_to_device_async,
TRANSFER_BUFFER_TO_DEVICE_ASYNC)(long* Mesh_pointer,
- realw* buffer,
- int* IREGION,
- int* FORWARD_OR_ADJOINT) {}
+ realw* buffer,
+ int* IREGION,
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(sync_copy_from_device,
SYNC_copy_FROM_DEVICE)(long* Mesh_pointer,
int* iphase,
realw* send_buffer,
- int* IREGION,
- int* FORWARD_OR_ADJOINT) {}
+ int* IREGION,
+ int* FORWARD_OR_ADJOINT) {}
//
@@ -86,18 +84,18 @@ void FC_FUNC_(sync_copy_from_device,
//
void FC_FUNC_(pause_for_debug,
- PAUSE_FOR_DEBUG)() {}
+ PAUSE_FOR_DEBUG)(void) {}
void FC_FUNC_(output_free_device_memory,
OUTPUT_FREE_DEVICE_MEMORY)(int* myrank) {}
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_(check_norm_acoustic_from_device,
CHECK_NORM_ACOUSTIC_FROM_DEVICE)(realw* norm,
- long* Mesh_pointer_f,
- int* FORWARD_OR_ADJOINT) {}
+ long* Mesh_pointer_f,
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(check_norm_elastic_from_device,
CHECK_NORM_ELASTIC_FROM_DEVICE)(realw* norm,
@@ -109,35 +107,35 @@ void FC_FUNC_(check_norm_strain_from_device,
realw* strain_norm2,
long* Mesh_pointer_f) {}
- void FC_FUNC_(check_max_norm_displ_gpu,
- CHECK_MAX_NORM_DISPL_GPU)(int* size, realw* displ,long* Mesh_pointer_f,int* announceID) {}
+void FC_FUNC_(check_max_norm_displ_gpu,
+ 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) {}
+void FC_FUNC_(check_max_norm_vector,
+ 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) {}
+void FC_FUNC_(check_max_norm_displ,
+ 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) {}
+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) {}
- 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) {}
+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) {}
- 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) {}
+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) {}
- void FC_FUNC_(check_max_norm_b_displ,
- CHECK_MAX_NORM_B_DISPL)(int* size, realw* b_displ,int* announceID) {}
+void FC_FUNC_(check_max_norm_b_displ,
+ 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) {}
+void FC_FUNC_(check_max_norm_b_accel,
+ 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) {}
+void FC_FUNC_(check_error_vectors,
+ 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) {}
+void FC_FUNC_(get_max_accel,
+ GET_MAX_ACCEL)(int* itf, int* sizef, long* Mesh_pointer) {}
//
@@ -146,22 +144,22 @@ void FC_FUNC_(check_norm_strain_from_device,
void FC_FUNC_(compute_add_sources_gpu,
COMPUTE_ADD_SOURCES_GPU)(long* Mesh_pointer_f,
- int* NSOURCESf,
- double* h_stf_pre_compute) {}
+ int* NSOURCESf,
+ double* h_stf_pre_compute) {}
void FC_FUNC_(compute_add_sources_backward_gpu,
COMPUTE_ADD_SOURCES_BACKWARD_GPU)(long* Mesh_pointer_f,
- int* NSOURCESf,
- double* h_stf_pre_compute) {}
+ int* NSOURCESf,
+ double* h_stf_pre_compute) {}
void FC_FUNC_(compute_add_sources_adjoint_gpu,
COMPUTE_ADD_SOURCES_ADJOINT_GPU)(long* Mesh_pointer,
- int* h_nrec) {}
+ int* h_nrec) {}
void FC_FUNC_(transfer_adj_to_device,
TRANSFER_ADJ_TO_DEVICE)(long* Mesh_pointer,
int* h_nrec,
- realw* h_adj_sourcearrays,
+ realw* h_adj_sourcearrays,
int* h_islice_selected_rec) {}
void FC_FUNC_(transfer_adj_to_device_async,
@@ -177,23 +175,23 @@ void FC_FUNC_(transfer_adj_to_device_async,
void FC_FUNC_(compute_coupling_fluid_cmb_gpu,
COMPUTE_COUPLING_FLUID_CMB_GPU)(long* Mesh_pointer_f,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(compute_coupling_fluid_icb_gpu,
COMPUTE_COUPLING_FLUID_ICB_GPU)(long* Mesh_pointer_f,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(compute_coupling_cmb_fluid_gpu,
COMPUTE_COUPLING_CMB_FLUID_GPU)(long* Mesh_pointer_f,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(compute_coupling_icb_fluid_gpu,
COMPUTE_COUPLING_ICB_FLUID_GPU)(long* Mesh_pointer_f,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(compute_coupling_ocean_gpu,
COMPUTE_COUPLING_OCEAN_GPU)(long* Mesh_pointer_f,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
//
@@ -202,8 +200,8 @@ void FC_FUNC_(compute_coupling_ocean_gpu,
void FC_FUNC_(compute_forces_crust_mantle_gpu,
COMPUTE_FORCES_CRUST_MANTLE_GPU)(long* Mesh_pointer_f,
- int* iphase,
- int* FORWARD_OR_ADJOINT_f) {}
+ int* iphase,
+ int* FORWARD_OR_ADJOINT_f) {}
//
@@ -212,8 +210,8 @@ void FC_FUNC_(compute_forces_crust_mantle_gpu,
void FC_FUNC_(compute_forces_inner_core_gpu,
COMPUTE_FORCES_INNER_CORE_GPU)(long* Mesh_pointer_f,
- int* iphase,
- int* FORWARD_OR_ADJOINT_f) {}
+ int* iphase,
+ int* FORWARD_OR_ADJOINT_f) {}
//
@@ -222,9 +220,9 @@ void FC_FUNC_(compute_forces_inner_core_gpu,
void FC_FUNC_(compute_forces_outer_core_gpu,
COMPUTE_FORCES_OUTER_CORE_GPU)(long* Mesh_pointer_f,
- int* iphase,
- realw* time_f,
- int* FORWARD_OR_ADJOINT_f) {}
+ int* iphase,
+ realw* time_f,
+ int* FORWARD_OR_ADJOINT_f) {}
//
@@ -247,7 +245,7 @@ void FC_FUNC_(compute_kernels_strgth_noise_gpu,
void FC_FUNC_(compute_kernels_hess_gpu,
COMPUTE_KERNELS_HESS_GPU)(long* Mesh_pointer,
- realw* deltat_f) {}
+ realw* deltat_f) {}
//
@@ -256,17 +254,17 @@ void FC_FUNC_(compute_kernels_hess_gpu,
void FC_FUNC_(compute_stacey_acoustic_gpu,
COMPUTE_STACEY_ACOUSTIC_GPU)(long* Mesh_pointer_f,
- realw* absorb_potential,
- int* itype) {}
+ realw* absorb_potential,
+ int* itype) {}
void FC_FUNC_(compute_stacey_acoustic_backward_gpu,
COMPUTE_STACEY_ACOUSTIC_BACKWARD_GPU)(long* Mesh_pointer_f,
- realw* absorb_potential,
- int* itype) {}
+ realw* absorb_potential,
+ int* itype) {}
void FC_FUNC_(compute_stacey_acoustic_undoatt_gpu,
COMPUTE_STACEY_ACOUSTIC_UNDOATT_GPU)(long* Mesh_pointer_f,
- int* itype) {}
+ int* itype) {}
//
@@ -275,17 +273,17 @@ void FC_FUNC_(compute_stacey_acoustic_undoatt_gpu,
void FC_FUNC_(compute_stacey_elastic_gpu,
COMPUTE_STACEY_ELASTIC_GPU)(long* Mesh_pointer_f,
- realw* absorb_field,
- int* itype) {}
+ realw* absorb_field,
+ int* itype) {}
void FC_FUNC_(compute_stacey_elastic_backward_gpu,
COMPUTE_STACEY_ELASTIC_BACKWARD_GPU)(long* Mesh_pointer_f,
- realw* absorb_field,
- int* itype) {}
+ realw* absorb_field,
+ int* itype) {}
void FC_FUNC_(compute_stacey_elastic_undoatt_gpu,
COMPUTE_STACEY_ELASTIC_UNDOATT_GPU)(long* Mesh_pointer_f,
- int* itype) {}
+ int* itype) {}
//
@@ -293,9 +291,12 @@ void FC_FUNC_(compute_stacey_elastic_undoatt_gpu,
//
void FC_FUNC_(initialize_gpu_device,
- INITIALIZE_GPU_DEVICE)(int *runtime_f, const char *platform_filter, const char *device_filter, int *myrank_f, int *nb_devices) {
- fprintf(stderr,"ERROR: GPU_MODE enabled without GPU/CUDA Support. To enable GPU support, reconfigure with --with-gpu and/or --with-opencl flag.\n");
- exit(1);
+ INITIALIZE_GPU_DEVICE)(int *runtime_f, const char *platform_filter, const char *device_filter,
+ int *myrank_f, int *nb_devices)
+{
+ fprintf(stderr, "ERROR: GPU_MODE enabled without GPU/CUDA Support. "
+ "To enable GPU support, reconfigure with --with-gpu and/or --with-opencl flag.\n");
+ exit(1);
}
@@ -319,13 +320,13 @@ void FC_FUNC_(noise_transfer_surface_to_host,
void FC_FUNC_(noise_add_source_master_rec_gpu,
NOISE_ADD_SOURCE_MASTER_REC_GPU)(long* Mesh_pointer_f,
- int* it_f,
- int* irec_master_noise_f,
- int* islice_selected_rec) {}
+ int* it_f,
+ int* irec_master_noise_f,
+ int* islice_selected_rec) {}
void FC_FUNC_(noise_add_surface_movie_gpu,
NOISE_ADD_SURFACE_MOVIE_GPU)(long* Mesh_pointer_f,
- realw* h_noise_surface_movie) {}
+ realw* h_noise_surface_movie) {}
//
@@ -388,32 +389,32 @@ void FC_FUNC_(prepare_fields_gravity_device,
void FC_FUNC_(prepare_fields_attenuat_device,
PREPARE_FIELDS_ATTENUAT_DEVICE)(long* Mesh_pointer_f,
- realw* R_xx_crust_mantle,
- realw* R_yy_crust_mantle,
- realw* R_xy_crust_mantle,
- realw* R_xz_crust_mantle,
- realw* R_yz_crust_mantle,
- realw* b_R_xx_crust_mantle,
- realw* b_R_yy_crust_mantle,
- realw* b_R_xy_crust_mantle,
- realw* b_R_xz_crust_mantle,
- realw* b_R_yz_crust_mantle,
- realw* factor_common_crust_mantle,
- realw* one_minus_sum_beta_crust_mantle,
- realw* R_xx_inner_core,
- realw* R_yy_inner_core,
- realw* R_xy_inner_core,
- realw* R_xz_inner_core,
- realw* R_yz_inner_core,
- realw* b_R_xx_inner_core,
- realw* b_R_yy_inner_core,
- realw* b_R_xy_inner_core,
- realw* b_R_xz_inner_core,
- realw* b_R_yz_inner_core,
- realw* factor_common_inner_core,
- realw* one_minus_sum_beta_inner_core,
- realw* alphaval,realw* betaval,realw* gammaval,
- realw* b_alphaval,realw* b_betaval,realw* b_gammaval) {}
+ realw* R_xx_crust_mantle,
+ realw* R_yy_crust_mantle,
+ realw* R_xy_crust_mantle,
+ realw* R_xz_crust_mantle,
+ realw* R_yz_crust_mantle,
+ realw* b_R_xx_crust_mantle,
+ realw* b_R_yy_crust_mantle,
+ realw* b_R_xy_crust_mantle,
+ realw* b_R_xz_crust_mantle,
+ realw* b_R_yz_crust_mantle,
+ realw* factor_common_crust_mantle,
+ realw* one_minus_sum_beta_crust_mantle,
+ realw* R_xx_inner_core,
+ realw* R_yy_inner_core,
+ realw* R_xy_inner_core,
+ realw* R_xz_inner_core,
+ realw* R_yz_inner_core,
+ realw* b_R_xx_inner_core,
+ realw* b_R_yy_inner_core,
+ realw* b_R_xy_inner_core,
+ realw* b_R_xz_inner_core,
+ realw* b_R_yz_inner_core,
+ realw* factor_common_inner_core,
+ realw* one_minus_sum_beta_inner_core,
+ realw* alphaval,realw* betaval,realw* gammaval,
+ realw* b_alphaval,realw* b_betaval,realw* b_gammaval) {}
void FC_FUNC_(prepare_fields_strain_device,
PREPARE_FIELDS_STRAIN_DEVICE)(long* Mesh_pointer_f,
@@ -587,7 +588,7 @@ void FC_FUNC_(prepare_inner_core_device,
void FC_FUNC_(prepare_cleanup_device,
PREPARE_CLEANUP_DEVICE)(long* Mesh_pointer_f,
- int* NCHUNKS_VAL) {}
+ int* NCHUNKS_VAL) {}
//
@@ -680,12 +681,12 @@ void FC_FUNC_(transfer_accel_oc_from_device,
void FC_FUNC_(transfer_strain_cm_from_device,
TRANSFER_STRAIN_CM_FROM_DEVICE)(long* Mesh_pointer,
- realw* eps_trace_over_3,
- realw* epsilondev_xx,
- realw* epsilondev_yy,
- realw* epsilondev_xy,
- realw* epsilondev_xz,
- realw* epsilondev_yz) {}
+ realw* eps_trace_over_3,
+ realw* epsilondev_xx,
+ realw* epsilondev_yy,
+ realw* epsilondev_xy,
+ realw* epsilondev_xz,
+ realw* epsilondev_yz) {}
void FC_FUNC_(transfer_b_strain_cm_to_device,
TRANSFER_B_STRAIN_CM_TO_DEVICE)(long* Mesh_pointer,
@@ -719,6 +720,7 @@ void FC_FUNC_(transfer_rmemory_cm_from_device,
realw* R_xy,
realw* R_xz,
realw* R_yz) {}
+
void FC_FUNC_(transfer_b_rmemory_cm_to_device,
TRANSFER_B_RMEMORY_CM_TO_DEVICE)(long* Mesh_pointer,
realw* b_R_xx,
@@ -726,6 +728,7 @@ void FC_FUNC_(transfer_b_rmemory_cm_to_device,
realw* b_R_xy,
realw* b_R_xz,
realw* b_R_yz) {}
+
void FC_FUNC_(transfer_rmemory_ic_from_device,
TRANSFER_RMEMORY_IC_FROM_DEVICE)(long* Mesh_pointer,
realw* R_xx,
@@ -749,8 +752,8 @@ void FC_FUNC_(transfer_rotation_from_device,
void FC_FUNC_(transfer_b_rotation_to_device,
TRANSFER_B_ROTATION_TO_DEVICE)(long* Mesh_pointer,
- realw* A_array_rotation,
- realw* B_array_rotation) {}
+ realw* A_array_rotation,
+ realw* B_array_rotation) {}
void FC_FUNC_(transfer_kernels_cm_to_host,
TRANSFER_KERNELS_CM_TO_HOST)(long* Mesh_pointer,
@@ -780,8 +783,8 @@ void FC_FUNC_(transfer_kernels_noise_to_host,
void FC_FUNC_(transfer_kernels_hess_cm_tohost,
TRANSFER_KERNELS_HESS_CM_TOHOST)(long* Mesh_pointer,
- realw* h_hess_kl,
- int* NSPEC) {}
+ realw* h_hess_kl,
+ int* NSPEC) {}
//
@@ -790,42 +793,42 @@ void FC_FUNC_(transfer_kernels_hess_cm_tohost,
void FC_FUNC_(update_displacement_ic_gpu,
UPDATE_DISPLACMENT_IC_GPU)(long* Mesh_pointer_f,
- realw* deltat_f,
- realw* deltatsqover2_f,
- realw* deltatover2_f,
- int* FORWARD_OR_ADJOINT) {}
+ realw* deltat_f,
+ realw* deltatsqover2_f,
+ realw* deltatover2_f,
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(update_displacement_cm_gpu,
UPDATE_DISPLACMENT_CM_GPU)(long* Mesh_pointer_f,
+ realw* deltat_f,
+ realw* deltatsqover2_f,
+ realw* deltatover2_f,
+ int* FORWARD_OR_ADJOINT) {}
+
+void FC_FUNC_(update_displacement_oc_gpu,
+ UPDATE_DISPLACEMENT_OC_gpu)(long* Mesh_pointer_f,
realw* deltat_f,
realw* deltatsqover2_f,
realw* deltatover2_f,
int* FORWARD_OR_ADJOINT) {}
-void FC_FUNC_(update_displacement_oc_gpu,
- UPDATE_DISPLACEMENT_OC_gpu)(long* Mesh_pointer_f,
- realw* deltat_f,
- realw* deltatsqover2_f,
- realw* deltatover2_f,
- int* FORWARD_OR_ADJOINT) {}
-
void FC_FUNC_(multiply_accel_elastic_gpu,
MULTIPLY_ACCEL_ELASTIC_GPU)(long* Mesh_pointer,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(update_veloc_elastic_gpu,
UPDATE_VELOC_ELASTIC_GPU)(long* Mesh_pointer,
- realw* deltatover2_f,
- int* FORWARD_OR_ADJOINT) {}
+ realw* deltatover2_f,
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(multiply_accel_acoustic_gpu,
MULTIPLY_ACCEL_ACOUSTIC_GPU)(long* Mesh_pointer,
- int* FORWARD_OR_ADJOINT) {}
+ int* FORWARD_OR_ADJOINT) {}
void FC_FUNC_(update_veloc_acoustic_gpu,
UPDATE_VELOC_ACOUSTIC_GPU)(long* Mesh_pointer,
- realw* deltatover2_f,
- int* FORWARD_OR_ADJOINT) {}
+ realw* deltatover2_f,
+ int* FORWARD_OR_ADJOINT) {}
//
@@ -834,26 +837,26 @@ void FC_FUNC_(update_veloc_acoustic_gpu,
void FC_FUNC_(write_seismograms_transfer_gpu,
WRITE_SEISMOGRAMS_TRANSFER_GPU)(long* Mesh_pointer_f,
- realw* displ,
- realw* b_displ,
- realw* eps_trace_over_3,
- realw* epsilondev_xx,
- realw* epsilondev_yy,
- realw* epsilondev_xy,
- realw* epsilondev_xz,
- realw* epsilondev_yz,
- int* number_receiver_global,
- int* ispec_selected_rec,
- int* ispec_selected_source,
- int* ibool) {}
+ realw* displ,
+ realw* b_displ,
+ realw* eps_trace_over_3,
+ realw* epsilondev_xx,
+ realw* epsilondev_yy,
+ realw* epsilondev_xy,
+ realw* epsilondev_xz,
+ realw* epsilondev_yz,
+ int* number_receiver_global,
+ int* ispec_selected_rec,
+ int* ispec_selected_source,
+ int* ibool) {}
void FC_FUNC_(transfer_seismo_from_device_async,
TRANSFER_SEISMO_FROM_DEVICE_ASYNC)(long* Mesh_pointer_f,
realw* displ,
realw* b_displ,
- int* number_receiver_global,
- int* ispec_selected_rec,
- int* ispec_selected_source,
- int* ibool) {}
+ int* number_receiver_global,
+ int* ispec_selected_rec,
+ int* ispec_selected_source,
+ int* ibool) {}
More information about the CIG-COMMITS
mailing list