From c3b6e2695f17de93f3c3b73343b4d58703888dcd Mon Sep 17 00:00:00 2001
From: JanThorbecke <janth@xs4all.nl>
Date: Fri, 5 Feb 2021 06:58:36 +0100
Subject: [PATCH] clang osx warning and error fixes
---
extrap/.DS_Store | Bin 6148 -> 6148 bytes
marchenko/applyMute_tshift.c | 2 ++
marchenko/findFirstBreak.c | 1 +
marchenko/marchenko_primaries.c | 4 ++--
marchenko/writeDataIter.c | 2 +-
marchenko3D/TWtransform.c | 5 +----
marchenko3D/applyMute3D.c | 4 +++-
marchenko3D/getFileInfo3Dzfp.c | 4 ++--
marchenko3D/writeDataIter3D.c | 2 +-
9 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/extrap/.DS_Store b/extrap/.DS_Store
index 14850029b2e2aebed09cfc4fffb75769304464f8..c3b7e3a2a3d8b2fe690a6030d2e0100659cfb237 100644
GIT binary patch
delta 226
zcmZoMXfc=|#>B!ku~2NHo}wrV0|Nsi1A_oVaY0f}eiD#(GO1v*BJ*-)J&+VLLkdGa
zLvm6%vUE;nafyM!bw(y;7FITP4h{}(4qlGQ)=XiO=P`-J7#W!9C>R<W*6Ju!TbLW@
zD43d=*Vb}!h^rdfdM4ynR#n&3*3AT(4FrrptHFRDO2epGKnB$Avf!e;ocz3Wpa|n;
j9ws*C&Fmcf96%ocUHP4PGQWr;2hbEIkj~8!B5RldS`93J
delta 85
zcmZoMXfc=|#>B)qu~2NHo}wrd0|Nsi1A_oVaY0f}eiD#(C#hg#;c~{w1|lq*Sy-8w
kH#U4_+RV<u&jHl5S&-v9^JIPzM-HGukUo~p5h81t0ce&Jc>n+a
diff --git a/marchenko/applyMute_tshift.c b/marchenko/applyMute_tshift.c
index 158f270..26cd141 100644
--- a/marchenko/applyMute_tshift.c
+++ b/marchenko/applyMute_tshift.c
@@ -3,7 +3,9 @@
#include <string.h>
#include <math.h>
#include <assert.h>
+#include "genfft.h"
+void verr(char *fmt, ...);
#ifndef MAX
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#endif
diff --git a/marchenko/findFirstBreak.c b/marchenko/findFirstBreak.c
index 100974d..40a7c5e 100644
--- a/marchenko/findFirstBreak.c
+++ b/marchenko/findFirstBreak.c
@@ -4,6 +4,7 @@
#include <math.h>
#include <assert.h>
+void vmess(char *fmt, ...);
#ifndef MAX
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#endif
diff --git a/marchenko/marchenko_primaries.c b/marchenko/marchenko_primaries.c
index 9dcc6a4..7a4d68a 100644
--- a/marchenko/marchenko_primaries.c
+++ b/marchenko/marchenko_primaries.c
@@ -790,8 +790,8 @@ int main (int argc, char **argv)
energyMi += RMi[l*nacq*nts+ix*nts+j]*RMi[l*nacq*nts+ix*nts+j];
}
}
- if ( (iter==0) ) energyM0[l] = energyMi;
- if ( (recur==0) ) {
+ if ( iter==0 ) energyM0[l] = energyMi;
+ if ( recur==0 ) {
vmess(" - ii %d: Mi at iteration %d has energy %e; relative to M0 %e", ii, iter, sqrt(energyMi), sqrt(energyMi/energyM0[l]));
}
}
diff --git a/marchenko/writeDataIter.c b/marchenko/writeDataIter.c
index e75ffb1..23ca41b 100644
--- a/marchenko/writeDataIter.c
+++ b/marchenko/writeDataIter.c
@@ -25,7 +25,7 @@ int writeDataIter(char *file_iter, float *data, segy *hdrs, int n1, int n2, floa
char number[16], filename[1024];
float *trace;
- if (file_iter==NULL) return;
+ if (file_iter==NULL) return -1;
trace = (float *)malloc(n1*sizeof(float));
strcpy(filename, file_iter);
sprintf(number,"_%03d",(iter));
diff --git a/marchenko3D/TWtransform.c b/marchenko3D/TWtransform.c
index 12bcb7a..72e6fb3 100644
--- a/marchenko3D/TWtransform.c
+++ b/marchenko3D/TWtransform.c
@@ -3,14 +3,11 @@
#include <string.h>
#include <math.h>
#include "segy.h"
+#include "genfft.h"
#include "zfpmar.h"
#include <assert.h>
#include <zfp.h>
-typedef struct { /* complex number */
- float r,i;
-} complex;
-
#define NINT(x) ((long)((x)>0.0?(x)+0.5:(x)-0.5))
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#define MIN(x,y) ((x) < (y) ? (x) : (y))
diff --git a/marchenko3D/applyMute3D.c b/marchenko3D/applyMute3D.c
index b1e0abe..985b918 100644
--- a/marchenko3D/applyMute3D.c
+++ b/marchenko3D/applyMute3D.c
@@ -3,7 +3,9 @@
#include <string.h>
#include <math.h>
#include <assert.h>
+#include "genfft.h"
+void verr(char *fmt, ...);
#ifndef MAX
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#endif
@@ -328,4 +330,4 @@ void timeShift(float *data, long nsam, long nrec, float dt, float shift, float f
free(trace);
return;
-}
\ No newline at end of file
+}
diff --git a/marchenko3D/getFileInfo3Dzfp.c b/marchenko3D/getFileInfo3Dzfp.c
index 36854f5..105c829 100644
--- a/marchenko3D/getFileInfo3Dzfp.c
+++ b/marchenko3D/getFileInfo3Dzfp.c
@@ -38,7 +38,7 @@ long getFileInfo3Dzfp(char *filename, long *n1, long *n2, long *n3, long *ngath,
fp_in = fopen(filename, "r");
if (fp_in==NULL) {
- fprintf(stderr,"input file %s has an error\n", fp_in);
+ fprintf(stderr,"input file %s has an error\n", filename);
perror("error in opening file: ");
fflush(stderr);
return -1;
@@ -78,4 +78,4 @@ long getFileInfo3Dzfp(char *filename, long *n1, long *n2, long *n3, long *ngath,
*nxm = (*n2)*(*n3);
return 0;
-}
\ No newline at end of file
+}
diff --git a/marchenko3D/writeDataIter3D.c b/marchenko3D/writeDataIter3D.c
index fbaecdb..dab35d6 100644
--- a/marchenko3D/writeDataIter3D.c
+++ b/marchenko3D/writeDataIter3D.c
@@ -26,7 +26,7 @@ long writeDataIter3D(char *file_iter, float *data, segy *hdrs, long n1, long n2,
trace = (float *)malloc(n1*sizeof(float));
strcpy(filename, file_iter);
- sprintf(number,"_%03d",(iter));
+ sprintf(number,"_%03ld",(iter));
name_ext(filename, number);
fp_iter = fopen(filename, "w+");
if (fp_iter==NULL) verr("error on creating output file %s", filename);
--
GitLab