remove the single and heffte versions of turbulence code - use only a…

…mrex::FFT now
AMReX-FHD · Jan 3, 2025 · c28f5ae · c28f5ae
1 parent de50cab
commit c28f5ae
Showing 8 changed files with 52 additions and 1,984 deletions.
diff --git a/src_analysis/Make.package b/src_analysis/Make.package
@@ -2,11 +2,4 @@ CEXE_headers += StructFact.H
 CEXE_sources += StructFact.cpp
 
 CEXE_headers += TurbSpectra.H
-CEXE_headers += TurbSpectra_distributed.H
-CEXE_sources += TurbSpectra_distributed.cpp
-
-#CEXE_sources += TurbSpectra_single.cpp
-#CEXE_sources += TurbSpectra_heffte.cpp
-
-#CEXE_headers += TurbSpectra_single.H
-#CEXE_headers += TurbSpectra_heffte.H
+CEXE_sources += TurbSpectra.cpp
diff --git a/src_analysis/TurbSpectra.H b/src_analysis/TurbSpectra.H
@@ -1,12 +1,52 @@
-#ifndef _TurbSpectra_H_
-#define _TurbSpectra_H_
-
-#include <TurbSpectra_distributed.H>
-//#if defined(HEFFTE_FFTW) || defined(HEFFTE_CUFFT) || defined(HEFFTE_ROCFFT) // use heFFTe
-//#include <TurbSpectra_heffte.H>
-//#elif defined(USE_DISTRIBUTED_FFT) // use single grid FFT
-//#include <TurbSpectra_distributed.H>
-//#else  // use single grid FFT
-//#include <TurbSpectra_single.H>
-//#endif
+#ifndef _TurbSpectraDistributed_H_
+#define _TurbSpectraDistributed_H_
+
+#include <AMReX.H>
+#include <AMReX_MultiFab.H>
+#include <AMReX_Vector.H>
+#include <AMReX_VisMF.H>
+
+#include <AMReX_GpuComplex.H>
+
+#include <string>
+
+#include "common_functions.H"
+
+#define ALIGN 16
+
+using namespace amrex;
+
+
+void IntegrateKScalar(const MultiFab& cov_mag,
+                      	    const std::string& name,
+                            const int& step,
+                            const int& comp);
+//void IntegrateKScalarHeffte(const BaseFab<GpuComplex<Real> >& spectral_field,
+//                      	    const std::string& name, const Real& scaling,
+//                      	    const Box& c_local_box,
+//                      	    const Real& sqrtnpts,
+//                      	    const int& step);
+void IntegrateKVelocity(const MultiFab& cov_mag,
+                              const std::string& name,
+                              const int& step,
+                              const int& comp);
+//void IntegrateKVelocityHeffte(const BaseFab<GpuComplex<Real> >& spectral_fieldx,
+//			      const BaseFab<GpuComplex<Real> >& spectral_fieldy,
+//			      const BaseFab<GpuComplex<Real> >& spectral_fieldz,
+//                              const std::string& name, const Real& scaling,
+//                              const Box& c_local_box,
+//                              const int& step);
+void TurbSpectrumScalar(const MultiFab& variables, 
+                              const amrex::Geometry& geom, 
+                              const int& step, 
+                              const amrex::Vector<amrex::Real>& var_scaling,
+                              const amrex::Vector< std::string >& var_names);
+void TurbSpectrumVelDecomp(const MultiFab& vel,
+                                 MultiFab& vel_decomp,
+                                 const amrex::Geometry& geom,
+                                 const int& step,
+                                 const amrex::Real& var_scaling,
+                                 const amrex::Vector< std::string >& var_names);
+
+
 #endif
diff --git a/src_analysis/TurbSpectra_distributed.cpp → src_analysis/TurbSpectra.cpp b/src_analysis/TurbSpectra_distributed.cpp → src_analysis/TurbSpectra.cpp
diff --git a/src_analysis/TurbSpectra_distributed.H b/src_analysis/TurbSpectra_distributed.H
diff --git a/src_analysis/TurbSpectra_heffte.H b/src_analysis/TurbSpectra_heffte.H
diff --git a/src_analysis/TurbSpectra_heffte.cpp b/src_analysis/TurbSpectra_heffte.cpp
diff --git a/src_analysis/TurbSpectra_single.H b/src_analysis/TurbSpectra_single.H
diff --git a/src_analysis/TurbSpectra_single.cpp b/src_analysis/TurbSpectra_single.cpp