Merge branch 'development' into turb-inflow-doc

AMReX-Combustion · Apr 12, 2024 · 5d6e547 · 5d6e547
2 parents d76e4a0 + 0d543af
commit 5d6e547
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/Docs/sphinx/manual/LMeXControls.rst b/Docs/sphinx/manual/LMeXControls.rst
@@ -122,7 +122,8 @@ IO parameters
     amr.restart          = chk00100        # [OPT, DEF=""] Checkpoint from which to restart the simulation
     amr.initDataPlt      = plt01000        # [OPT, DEF=""] Provide a plotfile from which to extract initial data
     amr.regrid_on_restart = 1              # [OPT, DEF="0"] Trigger a regrid after the data from checkpoint are loaded
-
+    amr.n_files          = 64              # [OPT, DEF="min(256,NProcs)"] Number of files to write per level
+    
 Refinement controls
 -------------------
 
@@ -485,6 +486,7 @@ fine-covered regions are masked. The following provide examples for each diagnos
     peleLM.xnormP.int    = 5                                        # Frequency (as step #) for performing the diagnostic
     peleLM.xnormP.interpolation = Linear                            # [OPT, DEF=Linear] Interpolation type : Linear or Quadratic
     peleLM.xnormP.field_names = x_velocity mag_vort density         # List of variables outputted to the 2D pltfile
+    peleLM.xnormP.n_files = 2                                       # [OPT, DEF="min(256,NProcs)"] Number of files to write per level
 
     peleLM.condT.type = DiagConditional                             # Diagnostic type
     peleLM.condT.file = condTest                                    # Output file prefix

diff --git a/Source/PeleLMeX.H b/Source/PeleLMeX.H
@@ -1790,6 +1790,7 @@ public:
   amrex::Real m_max_wall_time = -1.0;
   int m_nstep = -1;
   int m_max_step = -1;
+  int m_nfiles = 1;
 
   int m_regrid_int = -1;
   int m_regrid_on_restart = 0;

diff --git a/Source/PeleLMeX_Plot.cpp b/Source/PeleLMeX_Plot.cpp
@@ -70,6 +70,8 @@ PeleLM::WritePlotFile()
     amrex::Print() << "\n Writing plotfile: " << plotfilename << "\n";
   }
 
+  VisMF::SetNOutFiles(m_nfiles);
+
   //----------------------------------------------------------------
   // Average down the state
   averageDownState(AmrNewTime);
@@ -522,6 +524,8 @@ PeleLM::WriteCheckPointFile()
     amrex::Print() << "\n Writing checkpoint file: " << checkpointname << "\n";
   }
 
+  VisMF::SetNOutFiles(m_nfiles);
+
   amrex::PreBuildDirectorHierarchy(
     checkpointname, level_prefix, finest_level + 1, true);
 

diff --git a/Source/PeleLMeX_Setup.cpp b/Source/PeleLMeX_Setup.cpp
@@ -557,6 +557,8 @@ PeleLM::readParameters()
   ppa.query("dt_change_max", m_dtChangeMax);
   ppa.query("max_dt", m_max_dt);
   ppa.query("min_dt", m_min_dt);
+  m_nfiles = std::max(1, std::min(ParallelDescriptor::NProcs(), 256));
+  ppa.query("n_files", m_nfiles);
 
   if (max_level > 0 || (m_doLoadBalance != 0)) {
     ppa.query("regrid_int", m_regrid_int);