separated InitROMHandler from InitVariables

include/steady_ns_solver.hpp

@@ -149,8 +149,6 @@ friend class SteadyNSOperator;
 
    using StokesSolver::GetVariableNames;
 
-   void InitVariables() override;
-
    void BuildDomainOperators() override;
 
    void SetupDomainBCOperators() override;

include/unsteady_ns_solver.hpp

@@ -65,8 +65,7 @@ friend class SteadyNSOperator;
    virtual ~UnsteadyNSSolver();
 
    using SteadyNSSolver::GetVariableNames;
-
-   void InitVariables() override;
+
    void BuildDomainOperators() override;
    void AssembleOperator() override;
 

src/advdiff_solver.cpp

@@ -242,6 +242,7 @@ void AdvDiffSolver::GetFlowField(ParameterizedProblem *flow_problem)
 
    stokes_solver = new StokesSolver;
    stokes_solver->InitVariables();
+   if (use_rom) stokes_solver->InitROMHandler();
    stokes_solver->SetSolutionSaveMode(save_flow);
 
    bool flow_loaded = false;

src/linelast_solver.cpp

@@ -133,8 +133,6 @@ void LinElastSolver::InitVariables()
       // Does this make any difference?
       us[m]->SetTrueVector();
    }
-   if (use_rom)
-     MultiBlockSolver::InitROMHandler();
 }
 
 void LinElastSolver::BuildOperators()

src/main_workflow.cpp

@@ -160,6 +160,8 @@ void GenerateSamples(MPI_Comm comm)
 
       test = InitSolver();
       test->InitVariables();
+      if (test->UseRom())
+         test->InitROMHandler();
 
       problem->SetSingleRun();
       test->SetParameterizedProblem(problem);
@@ -264,6 +266,7 @@ void AuxiliaryTrainROM(MPI_Comm comm, SampleGenerator *sample_generator)
       if (!solver->UseRom()) mfem_error("ROM must be enabled for supremizer enrichment!\n");
 
       solver->InitVariables();
+      solver->InitROMHandler();
       // This time needs to be ROMHandler, in order not to run StokesSolver::LoadSupremizer.
       solver->GetROMHandler()->LoadReducedBasis();
 
@@ -289,6 +292,7 @@ void TrainEQP(MPI_Comm comm)
    MultiBlockSolver *test = NULL;
    test = InitSolver();
    test->InitVariables();
+   test->InitROMHandler();
 
    if (!test->IsNonlinear())
    {
@@ -383,6 +387,7 @@ void BuildROM(MPI_Comm comm)
    test = InitSolver();
    if (!test->UseRom()) mfem_error("ROM must be enabled for BuildROM!\n");
    test->InitVariables();
+   test->InitROMHandler();
    // test->InitVisualization();
 
    // The ROM operator will be built based on the parameter specified for single-run.
@@ -455,6 +460,7 @@ double SingleRun(MPI_Comm comm, const std::string output_file)
    ParameterizedProblem *problem = InitParameterizedProblem();
    MultiBlockSolver *test = InitSolver();
    test->InitVariables();
+   if (test->UseRom()) test->InitROMHandler();
    test->InitVisualization();
 
    StopWatch solveTimer;

src/poisson_solver.cpp

@@ -152,8 +152,6 @@ void PoissonSolver::InitVariables()
    }
 
    rhs_coeffs.SetSize(0);
-
-   if (use_rom) MultiBlockSolver::InitROMHandler();
 }
 
 void PoissonSolver::BuildOperators()

src/steady_ns_solver.cpp

@@ -316,19 +316,6 @@ SteadyNSSolver::~SteadyNSSolver()
    }
 }
 
-void SteadyNSSolver::InitVariables()
-{
-   StokesSolver::InitVariables();
-   if (use_rom)
-   {
-      rom_handler->SetNonlinearMode(nonlinear_mode);
-      subdomain_tensors.SetSize(numSub);
-      subdomain_tensors = NULL;
-      subdomain_eqps.SetSize(numSub);
-      subdomain_eqps = NULL;
-   }
-}
-
 void SteadyNSSolver::BuildDomainOperators()
 {
    StokesSolver::BuildDomainOperators();
@@ -633,6 +620,12 @@ void SteadyNSSolver::InitROMHandler()
 {
    StokesSolver::InitROMHandler();
 
+   rom_handler->SetNonlinearMode(nonlinear_mode);
+   subdomain_tensors.SetSize(numSub);
+   subdomain_tensors = NULL;
+   subdomain_eqps.SetSize(numSub);
+   subdomain_eqps = NULL;
+
    switch (rom_handler->GetNonlinearHandling())
    {
       case NonlinearHandling::TENSOR:

src/stokes_solver.cpp

@@ -217,8 +217,6 @@ void StokesSolver::InitVariables()
    }
 
    f_coeffs.SetSize(0);
-
-   if (use_rom) MultiBlockSolver::InitROMHandler();
 }
 
 void StokesSolver::DeterminePressureDirichlet()

src/unsteady_ns_solver.cpp

@@ -45,11 +45,6 @@ UnsteadyNSSolver::~UnsteadyNSSolver()
    delete Hop;
 }
 
-void UnsteadyNSSolver::InitVariables()
-{
-   StokesSolver::InitVariables();
-}
-
 void UnsteadyNSSolver::BuildDomainOperators()
 {
    SteadyNSSolver::BuildDomainOperators();