convection

Author: sfomel

user/fomels/Mcnvd.c

@@ -47,16 +47,20 @@ int main (int argc, char* argv[])
     sf_floatread(conv[0][0],n12*nw,cnv);
 
     for (i2=0; i2 < n2-1; i2++) {
-	resd[i2][0] = 0.0f;
-	for (i1=1; i1 < n1-1; i1++) {
+      for (i1=0; i1 < nw; i1++) {
+	resd[i2][i1] = 0.0f;
+      }
+	for (i1=nw; i1 < n1-nw; i1++) {
 	    dif = data[i2+1][i1] - data[i2][i1];
-	    resd[i2][i1] = -dif;
+	    resd[i2][i1] = dif;
 	    for (iw=1; iw <= order; iw++) {
-		resd[i2][i1] += conv[i2][2*iw-2][i1]*(dif - data[i2+1][i1+iw] + data[i2][i1-iw]);
-		resd[i2][i1] += conv[i2][2*iw-1][i1]*(dif - data[i2+1][i1-iw] + data[i2][i1+iw]);
+		resd[i2][i1] -= conv[i2][2*iw-2][i1]*(dif - data[i2+1][i1+iw] + data[i2][i1-iw]);
+		resd[i2][i1] -= conv[i2][2*iw-1][i1]*(dif - data[i2+1][i1-iw] + data[i2][i1+iw]);
 	    }
 	}
-	resd[i2][n1-1] = 0.0f;
+	for (i1=n1-nw; i1 < n1; i1++) {
+	  resd[i2][i1] = 0.0f;
+	}
     }
     for (i1=0; i1 < n1; i1++) {
 	resd[n2-1][i1] = 0.0f;

user/fomels/Mcnvpaint.c

@@ -1,6 +1,6 @@
-/* Conection painting. */
+/* Convection painting. */
 /*
-  Copyright (C) 2004 University of Texas at Austin
+  Copyright (C) 2025 University of Texas at Austin
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 int main (int argc, char* argv[])
 {
   int order, n1, n2, n12, i1, i2, i0, nw;
-  char *label, *unit;
     float **u, ***conv, *trace;
     float o1, d1, o2, d2, eps, *time;
     sf_file cnv, out, seed;
@@ -43,17 +42,10 @@ int main (int argc, char* argv[])
     n12 = n1*n2;
 
     if (!sf_histint(cnv,"n2",&nw)) sf_error("Need n2= in input");
-
-    sf_putint(out,"n2",n2);
-    sf_putfloat(out,"d2",d2);
-    sf_putfloat(out,"o2",o2);
-    if (NULL != (label= sf_histstring(cnv,"label3"))) sf_putstring(out,"label2",label);
-    if (NULL != (unit= sf_histstring(cnv,"unit3"))) sf_putstring(out,"unit2",unit);
-    
-    sf_putint(out,"n3",1);
-    
     order = nw/2;
 
+    sf_unshiftdim(cnv,out,2);
+
     if (NULL != sf_getstring("seed")) {
 	seed = sf_input("seed");
 	time = NULL;
@@ -98,6 +90,7 @@ int main (int argc, char* argv[])
 	u[i2][i1] = trace[i1];
       }
     }
+    
     for (i1=0; i1 < n1; i1++) {
       trace[i1] = u[i0][i1];
     }
@@ -107,6 +100,7 @@ int main (int argc, char* argv[])
 	u[i2][i1] = trace[i1];
       }
     }
+    
     sf_floatwrite(u[0],n1*n2,out);
 
     exit(0);