Began transition of spherical import to current philosophy for all

imports. #309
sirocco-rt · Nov 15, 2017 · f665df6 · f665df6
1 parent cc463d6
commit f665df6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/source/import_cylindrical.c b/source/import_cylindrical.c
@@ -248,6 +248,7 @@ cylindrical_make_grid_import (w, ndom)
       w[nn].v[0] = xx_cyl.v_x[n];
       w[nn].v[1] = xx_cyl.v_y[n];
       w[nn].v[2] = xx_cyl.v_z[n];
+      w[nn].inwind=xx_cyl.inwind[n];
 
       w[nn].xcen[0]=xx_cyl.wind_midx[xx_cyl.i[n]];
       w[nn].xcen[1]=0;

diff --git a/source/import_spherical.c b/source/import_spherical.c
@@ -121,14 +121,6 @@ import_1d (ndom, filename)
 
 
   xx_1d.ndim = ncell;
-  zdom[ndom].ndim = ncell + 3;	// ADD Buffer
-  zdom[ndom].mdim = 1;
-  zdom[ndom].wind_rho_min = zdom[ndom].rho_min = 0;
-  zdom[ndom].rmin = xx_1d.r[0];
-  zdom[ndom].wind_rho_max = zdom[ndom].zmax = zdom[ndom].rho_max =
-    zdom[ndom].rmax = xx_1d.r[ncell - 1];
-  zdom[ndom].wind_thetamin = zdom[ndom].wind_thetamax = 0.;
-
 
 
 
@@ -154,6 +146,14 @@ spherical_make_grid_import (w, ndom)
 
   int j, n;
 
+  zdom[ndom].ndim = xx_1d.ndim + 3;	// ADD Buffer
+  zdom[ndom].mdim = 1;
+  zdom[ndom].wind_rho_min = zdom[ndom].rho_min = 0;
+  zdom[ndom].rmin = xx_1d.r[0];
+  zdom[ndom].wind_rho_max = zdom[ndom].zmax = zdom[ndom].rho_max =
+    zdom[ndom].rmax = xx_1d.r[xx_1d.ndim - 1];
+  zdom[ndom].wind_thetamin = zdom[ndom].wind_thetamax = 0.;
+
   for (j = 0; j < xx_1d.ndim; j++)
     {
       n = j + zdom[ndom].nstart;