fixing warnings and robustness

Author: JanThorbecke

Make_include_OSX

@@ -94,7 +94,7 @@ ifneq ($(strip $(MKLROOT)),)
     endif
 else
     BLAS = -llapack -lblas 
-    BLAS = /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk//usr/lib/liblapack.tbd /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk//usr/lib/libblas.tbd
+    BLAS = /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib/liblapack.tbd /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib/libblas.tbd
 endif
 
 #LIBARIES

extrap/lib/Makefile

@@ -13,6 +13,7 @@ CSRC = \
 	getModelInfo.c \
 	readData.c \
 	writeData.c \
+	name_ext.c \
 	forwExtr.c \
 	getrecextr.c \
 	getrecvsp.c \

extrap/lib/name_ext.c

@@ -0,0 +1,44 @@
+#include<stdlib.h>
+#include<string.h>
+#include<stdio.h>
+
+/**
+*  inserts a character string after the filename, before the extension
+*
+*   AUTHOR:
+*           Jan Thorbecke ([email protected])
+*           The Netherlands 
+**/
+
+
+void name_ext(char *filename, char *extension)
+{
+	char ext[100];
+
+	if (strstr(filename, ".su") != NULL) {
+		sprintf(ext,"%s.su", extension);
+		strcpy(strstr(filename, ".su"), ext);
+	}
+	else if (strstr(filename, ".segy") != NULL) {
+		sprintf(ext,"%s.segy", extension);
+		strcpy(strstr(filename, ".segy"), ext);
+	}
+	else if (strstr(filename, ".mat") != NULL) {
+		sprintf(ext,"%s.mat", extension);
+		strcpy(strstr(filename, ".mat"), ext);
+	}
+	else if (strstr(filename, ".hdf") != NULL) {
+		sprintf(ext,"%s.hdf", extension);
+		strcpy(strstr(filename, ".hdf"), ext);
+	}
+	else if (strrchr(filename, '.') != NULL) {
+		sprintf(ext,"%s.su", extension);
+		strcpy(strrchr(filename, '.'), ext);
+	}
+	else {
+		sprintf(ext,"%s.su", extension);
+		strcat(filename, ext);
+	}
+
+	return;
+}

extrap/lib/verbosepkg.c

@@ -5,6 +5,9 @@
 #ifdef _CRAYMPP
 #include <intrinsics.h>
 #endif
+#ifdef _OPENMP
+#include <omp.h>
+#endif
 
 void verr(char *fmt, ...)
 {

extrap/main/opercalc.c

@@ -17,6 +17,7 @@ void shortoper(complex *kxwop, int nkx, complex *xwop, int opl, float dx,
 			float kw, float alfa1_w, float alfa2_w, float scale, int filter);
 
 int writeData(char *filename, float *data, segy *hdrs, int n2);
+void name_ext(char *filename, char *extension);
 
 /*********************** self documentation **********************/
 char *sdoc[] = {
@@ -296,12 +297,8 @@ int main(int argc, char **argv)
 		writeData(NULL, data_out, hdrs, n2);
 	}
 	else {
-		s = file_out;
-		q = &filename[0];
-		while (*s != '.') *q++ = *s++;
-		*q++ = '_'; *q++ = 'k'; *q++ = 'x';
-		while (*s != '\0') *q++ = *s++;
-		*q = '\0';
+        strcpy(filename, file_out);
+        name_ext(filename, "_kx");
 
 		if(verbose) vmess("Writing Kx-results to file %s", filename);
 		writeData(filename, data_out, hdrs, n2);
@@ -343,12 +340,8 @@ int main(int argc, char **argv)
 		writeData(NULL, data_out, hdrs, n2);
 	}
 	else {
-		s = file_out;
-		q = &filename[0];
-		while (*s != '.') *q++ = *s++;
-		*q++ = '_'; *q++ = 'x';
-		while (*s != '\0') *q++ = *s++;
-		*q = '\0';
+        strcpy(filename, file_out);
+        name_ext(filename, "_x");
 
 		if(verbose) vmess("Writing X-results to file %s", filename);
 		writeData(filename, data_out, hdrs, n2);

vmar/Marchenko_Iterations.c

@@ -6,6 +6,9 @@
 #ifdef MKL
 #include<mkl_cblas.h>
 #endif
+#ifdef _OPENMP
+#include <omp.h>
+#endif
 
 typedef struct { /* complex number */
 	float r,i;