Merge pull request boutproject#2038 from boutproject/loc_div_par_k_gr…

…ad_par Add location checks to Div_par_K_Grad_par
mikekryjak · May 27, 2020 · 1843ba1 · 1843ba1
2 parents dc737b2 + 635304a
commit 1843ba1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/mesh/difops.cxx b/src/mesh/difops.cxx
@@ -293,18 +293,26 @@ const Field3D Div_par_K_Grad_par(BoutReal kY, const Field3D &f, CELL_LOC outloc)
 }
 
 const Field2D Div_par_K_Grad_par(const Field2D &kY, const Field2D &f, CELL_LOC outloc) {
+  if (outloc == CELL_DEFAULT) outloc = f.getLocation();
+
   return interp_to(kY, outloc)*Grad2_par2(f, outloc) + Div_par(kY, outloc)*Grad_par(f, outloc);
 }
 
 const Field3D Div_par_K_Grad_par(const Field2D &kY, const Field3D &f, CELL_LOC outloc) {
+  if (outloc == CELL_DEFAULT) outloc = f.getLocation();
+
   return interp_to(kY, outloc)*Grad2_par2(f, outloc) + Div_par(kY, outloc)*Grad_par(f, outloc);
 }
 
 const Field3D Div_par_K_Grad_par(const Field3D &kY, const Field2D &f, CELL_LOC outloc) {
+  if (outloc == CELL_DEFAULT) outloc = f.getLocation();
+
   return interp_to(kY, outloc)*Grad2_par2(f, outloc) + Div_par(kY, outloc)*Grad_par(f, outloc);
 }
 
 const Field3D Div_par_K_Grad_par(const Field3D &kY, const Field3D &f, CELL_LOC outloc) {
+  if (outloc == CELL_DEFAULT) outloc = f.getLocation();
+
   return interp_to(kY, outloc)*Grad2_par2(f, outloc) + Div_par(kY, outloc)*Grad_par(f, outloc);
 }