Merge branch 'development' into cxx-correct-dterm

AMReX-Astro · Oct 9, 2023 · 9b86d36 · 9b86d36
2 parents e2ebcbd + ede7732
commit 9b86d36
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 299 deletions.
diff --git a/Source/radiation/Make.package b/Source/radiation/Make.package
@@ -41,8 +41,7 @@ ca_F90EXE_sources += rad_params.F90
 ca_F90EXE_sources += Rad_nd.F90
 CEXE_headers += fluxlimiter.H
 CEXE_headers += RadHydro.H
-ca_F90EXE_sources += fluxlimiter.F90
-ca_F90EXE_sources += filter.F90
+
 CEXE_sources += RadDerive.cpp
 CEXE_headers += RadDerive.H
 CEXE_headers += rad_util.H

diff --git a/Source/radiation/RAD_F.H b/Source/radiation/RAD_F.H
@@ -53,15 +53,6 @@ BL_FORT_PROC_DECL(CA_INITGROUPS3,ca_initgroups3)
 BL_FORT_PROC_DECL(CA_COMPUTE_KAPKAP, ca_compute_kapkap)
      (BL_FORT_FAB_ARG(kapkap), const BL_FORT_FAB_ARG(kap_r)); 
 
-// <MGFLD>
-#ifdef __cplusplus
-extern "C" {
-#endif
-void ca_initfluxlimiter
-   (const int* limiter, const int* closure);
-#ifdef __cplusplus
-}
-#endif
 
 extern "C"
 {

diff --git a/Source/radiation/Radiation.cpp b/Source/radiation/Radiation.cpp
@@ -333,8 +333,6 @@ Radiation::Radiation(Amr* Parent, Castro* castro, int restart)
     amrex::Abort("MGFLDSolver does not support limiter = 1");
   }
 
-  ca_initfluxlimiter(&radiation::limiter, &radiation::closure);
-
   inner_update_limiter = 0;
   pp.query("inner_update_limiter", inner_update_limiter);
 

diff --git a/Source/radiation/filter.F90 b/Source/radiation/filter.F90
diff --git a/Source/radiation/fluxlimiter.F90 b/Source/radiation/fluxlimiter.F90