Add the option to zero visc the diffusivity and thus add the zero_visc (

#60) * Add the option to zero visc the diffusivity and thus add the zero_visc kernel to all the pelelm_prob.H * Domain is now used even with EB
AMReX-Combustion · Mar 9, 2022 · 8ea9ba8 · 8ea9ba8
1 parent 8cbf143
commit 8ea9ba8
Show file tree

Hide file tree

Showing 27 changed files with 376 additions and 30 deletions.
diff --git a/Exec/Cases/CounterFlow/pelelm_prob.H b/Exec/Cases/CounterFlow/pelelm_prob.H
@@ -189,4 +189,20 @@ bcnormal(
       s_ext[VELX] = -vel;
    }
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/Cases/JetInCrossflow/pelelm_prob.H b/Exec/Cases/JetInCrossflow/pelelm_prob.H
@@ -247,4 +247,20 @@ void bcnormal(const amrex::Real x[AMREX_SPACEDIM], const int m_nAux,
   }
 }
 
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/Cases/NormalJet_OpenDomain/pelelm_prob.H b/Exec/Cases/NormalJet_OpenDomain/pelelm_prob.H
@@ -125,13 +125,16 @@ bcnormal(
 AMREX_GPU_DEVICE
 AMREX_FORCE_INLINE
 void
-zero_visc (int /*i*/, int /*j*/, int /*k*/,
-           amrex::Array4<amrex::Real> const& /*beta*/,
-           amrex::GeometryData const& /*geomdata*/,
-           amrex::Box const& /*dBox*/,
-           const int  /*dir*/,
-           const int  /*state_comp*/,
-           const int  /*nComp*/)
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
 {
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
 }
 #endif
diff --git a/Exec/Cases/PremBunsen2D/pelelm_prob.H b/Exec/Cases/PremBunsen2D/pelelm_prob.H
@@ -185,4 +185,20 @@ bcnormal(
       }
    }
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/Cases/PremBunsen3D/pelelm_prob.H b/Exec/Cases/PremBunsen3D/pelelm_prob.H
@@ -170,4 +170,20 @@ bcnormal(
       }
    }
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/Cases/TripleFlame/pelelm_prob.H b/Exec/Cases/TripleFlame/pelelm_prob.H
@@ -160,4 +160,20 @@ bcnormal(
   }
 
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/Efield/FlameSheetIons/pelelm_prob.H b/Exec/Efield/FlameSheetIons/pelelm_prob.H
@@ -202,4 +202,20 @@ bcnormal(
       }   
    }
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/Efield/IonizedAirWave/pelelm_prob.H b/Exec/Efield/IonizedAirWave/pelelm_prob.H
@@ -150,4 +150,20 @@ bcnormal(
       }   
    }
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/EB_ChallengeProblem/pelelm_prob.H b/Exec/RegTests/EB_ChallengeProblem/pelelm_prob.H
@@ -88,4 +88,20 @@ bcnormal(
 {
   const amrex::Real* prob_lo = geomdata.ProbLo();
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/EB_EnclosedFlame/pelelm_prob.H b/Exec/RegTests/EB_EnclosedFlame/pelelm_prob.H
@@ -131,4 +131,20 @@ bcnormal(
 {
   const amrex::Real* prob_lo = geomdata.ProbLo();
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/EB_EnclosedVortex/pelelm_prob.H b/Exec/RegTests/EB_EnclosedVortex/pelelm_prob.H
@@ -102,4 +102,20 @@ bcnormal(
 {
   const amrex::Real* prob_lo = geomdata.ProbLo();
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/EB_FlowPastCylinder/pelelm_prob.H b/Exec/RegTests/EB_FlowPastCylinder/pelelm_prob.H
@@ -155,4 +155,20 @@ bcnormal(
       s_ext[FIRSTSPEC+n] = massfrac[n] * s_ext[DENSITY];
     }
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/EB_PipeFlow/pelelm_prob.H b/Exec/RegTests/EB_PipeFlow/pelelm_prob.H
@@ -155,4 +155,20 @@ bcnormal(
       s_ext[FIRSTSPEC+n] = massfrac[n] * s_ext[DENSITY];
     }
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/EnclosedFlame/pelelm_prob.H b/Exec/RegTests/EnclosedFlame/pelelm_prob.H
@@ -134,4 +134,20 @@ bcnormal(
 {
   const amrex::Real* prob_lo = geomdata.ProbLo();
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/FlameSheet/pelelm_prob.H b/Exec/RegTests/FlameSheet/pelelm_prob.H
@@ -161,4 +161,20 @@ bcnormal(
     }
   }
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/HITDecay/pelelm_prob.H b/Exec/RegTests/HITDecay/pelelm_prob.H
@@ -173,4 +173,20 @@ bcnormal(
 {
   const amrex::Real* prob_lo = geomdata.ProbLo();
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/HotBubble/pelelm_prob.H b/Exec/RegTests/HotBubble/pelelm_prob.H
@@ -86,4 +86,20 @@ bcnormal(
 {
 
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif
diff --git a/Exec/RegTests/PeriodicCases/pelelm_prob.H b/Exec/RegTests/PeriodicCases/pelelm_prob.H
@@ -260,4 +260,20 @@ bcnormal(
   pele::physics::PMF::PmfData::DataContainer const * /*pmf_data*/)
 {
 }
+
+AMREX_GPU_DEVICE
+AMREX_FORCE_INLINE
+void
+zero_visc (int i, int j, int k,
+           amrex::Array4<amrex::Real> const& beta,
+           amrex::GeometryData const& geomdata,
+           amrex::Box const& domainBox,
+           const int  dir,
+           const int  beta_comp,
+           const int  nComp)
+{
+     amrex::ignore_unused(i,j,k,beta,geomdata,domainBox,dir,beta_comp,nComp);
+    // We treat species when beta_comp == 0 and nComp == NUM_SPECIES
+    // otherwise this routine could be called for other face diffusivity (Temp, velocity, ...)
+}
 #endif