foam*Initialization: use 1st order interpolation on input speed and d…

…irection grids
sivelab · Oct 13, 2017 · 5dc43f2 · 5dc43f2
1 parent fda246c
commit 5dc43f2
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 4 deletions.
diff --git a/src/ninja/foamDomainAverageInitialization.cpp b/src/ninja/foamDomainAverageInitialization.cpp
@@ -101,8 +101,32 @@ void foamDomainAverageInitialization::setWn2dGrids(WindNinjaInputs &input)
         CPLDebug("NINJA", "Buffering in foamDomainAverageInitialization...");
     }
 
+    //convert speed/dir to u/v for direction interpolation
+    AsciiGrid<double> inputUGrid;
+    AsciiGrid<double> inputVGrid;
+    inputUGrid.set_headerData(inputVelocityGrid);
+    inputVGrid.set_headerData(inputVelocityGrid);
+
+    for(int i=0; i<inputVelocityGrid.get_nRows(); i++) {
+        for(int j=0; j<inputVelocityGrid.get_nCols(); j++) {
+            wind_sd_to_uv(inputVelocityGrid(i,j), inputAngleGrid(i,j),
+                    &(inputUGrid)(i,j), &(inputVGrid)(i,j));
+        }
+    }
+
     //Interpolate from input grids to dem coincident grids
-    speedInitializationGrid.interpolateFromGrid(inputVelocityGrid, AsciiGrid<double>::order0);
-    dirInitializationGrid.interpolateFromGrid(inputAngleGrid, AsciiGrid<double>::order0);
+    uInitializationGrid.interpolateFromGrid(inputUGrid, AsciiGrid<double>::order1);
+    vInitializationGrid.interpolateFromGrid(inputVGrid, AsciiGrid<double>::order1);
+
+    inputUGrid.deallocate();
+    inputVGrid.deallocate();
+
+    //fill the speed and dir initialization grids
+    for(int i=0; i<speedInitializationGrid.get_nRows(); i++) {
+        for(int j=0; j<speedInitializationGrid.get_nCols(); j++) {
+            wind_uv_to_sd(uInitializationGrid(i,j), vInitializationGrid(i,j),
+                     &(speedInitializationGrid)(i,j), &(dirInitializationGrid)(i,j));
+        }
+    }
 }
 
diff --git a/src/ninja/foamWxModelInitialization.cpp b/src/ninja/foamWxModelInitialization.cpp
@@ -101,7 +101,31 @@ void foamWxModelInitialization::setWn2dGrids(WindNinjaInputs &input)
         CPLDebug("NINJA", "Buffering in foamWxModelInitialization...");
     }
 
+    //convert speed/dir to u/v for direction interpolation
+    AsciiGrid<double> inputUGrid;
+    AsciiGrid<double> inputVGrid;
+    inputUGrid.set_headerData(inputVelocityGrid);
+    inputVGrid.set_headerData(inputVelocityGrid);
+
+    for(int i=0; i<inputVelocityGrid.get_nRows(); i++) {
+        for(int j=0; j<inputVelocityGrid.get_nCols(); j++) {
+            wind_sd_to_uv(inputVelocityGrid(i,j), inputAngleGrid(i,j),
+                    &(inputUGrid)(i,j), &(inputVGrid)(i,j));
+        }
+    }
+
     //Interpolate from input grids to dem coincident grids
-    speedInitializationGrid.interpolateFromGrid(inputVelocityGrid, AsciiGrid<double>::order0);
-    dirInitializationGrid.interpolateFromGrid(inputAngleGrid, AsciiGrid<double>::order0);
+    uInitializationGrid.interpolateFromGrid(inputUGrid, AsciiGrid<double>::order1);
+    vInitializationGrid.interpolateFromGrid(inputVGrid, AsciiGrid<double>::order1);
+
+    inputUGrid.deallocate();
+    inputVGrid.deallocate();
+
+    //fill the speed and dir initialization grids
+    for(int i=0; i<speedInitializationGrid.get_nRows(); i++) {
+        for(int j=0; j<speedInitializationGrid.get_nCols(); j++) {
+            wind_uv_to_sd(uInitializationGrid(i,j), vInitializationGrid(i,j),
+                     &(speedInitializationGrid)(i,j), &(dirInitializationGrid)(i,j));
+        }
+    }
 }