Removal of time interval and closing files within BasisWriter::writeBasis

.github/workflows/run_tests/action.yml

@@ -4,7 +4,6 @@ runs:
     - name: Run unit tests
       run: |
           cd ${GITHUB_WORKSPACE}/build
-          ./tests/test_SVD
           ./tests/test_Vector
           ./tests/test_Matrix
           mpirun -n 3 --oversubscribe ./tests/test_Matrix

CMakeLists.txt

@@ -270,7 +270,6 @@ if(GTEST_FOUND)
     GNAT
     QDEIM
     S_OPT
-    SVD
     StaticSVD
     RandomizedSVD
     IncrementalSVD

examples/misc/combine_samples.cpp

@@ -101,8 +101,8 @@ int main(int argc, char* argv[])
     for (const auto& sample_name: sample_names) {
         CAROM::BasisReader reader(sample_name);
 
-        dim    = reader.getDim(kind, 0);
-        snaps += reader.getNumSamples(kind, 0);
+        dim    = reader.getDim(kind);
+        snaps += reader.getNumSamples(kind);
         if (dimFirst == 0) dimFirst = dim;
 
         CAROM_VERIFY(dim ==
@@ -180,7 +180,7 @@ int main(int argc, char* argv[])
         CAROM::Vector snap_cur(num_rows, true);
         for (int col = 0; col < num_cols; col++) {
             snap_cur = *snapshots->getColumn(col);
-            static_basis_generator2->takeSample(snap_cur.getData(), 0.0, false);
+            static_basis_generator2->takeSample(snap_cur.getData(), false);
         }
 
         /*-- Compute SVD and save file --*/

examples/prom/de_parametric_maxwell_greedy.cpp

@@ -316,7 +316,7 @@ double simulation()
         // 19. take and write snapshot for ROM
         if (offline)
         {
-            bool addSample = generator->takeSample(X.GetData(), 0.0, 0.01);
+            bool addSample = generator->takeSample(X.GetData());
             generator->writeSnapshot();
             basisIdentifiers.push_back(saveBasisName);
             delete generator;
@@ -329,7 +329,7 @@ double simulation()
         // 21. read the reduced basis
         assembleTimer.Start();
         CAROM::BasisReader reader(loadBasisName);
-        spatialbasis = reader.getSpatialBasis(0.0);
+        spatialbasis = reader.getSpatialBasis();
         numRowRB = spatialbasis->numRows();
         numColumnRB = spatialbasis->numColumns();
 

examples/prom/dg_advection_global_rom.cpp

@@ -697,7 +697,7 @@ int main(int argc, char *argv[])
         Vector u_curr(*U);
         Vector u_centered(U->Size());
         subtract(u_curr, u_init, u_centered);
-        bool addSample = generator->takeSample(u_centered.GetData(), t, dt);
+        bool addSample = generator->takeSample(u_centered.GetData());
     }
 
     // 11. The merge phase
@@ -731,11 +731,11 @@ int main(int argc, char *argv[])
         CAROM::BasisReader reader(basisName);
         if (rdim != -1)
         {
-            spatialbasis = reader.getSpatialBasis(0.0, rdim);
+            spatialbasis = reader.getSpatialBasis(rdim);
         }
         else
         {
-            spatialbasis = reader.getSpatialBasis(0.0, ef);
+            spatialbasis = reader.getSpatialBasis(ef);
         }
         numRowRB = spatialbasis->numRows();
         numColumnRB = spatialbasis->numColumns();
@@ -831,7 +831,7 @@ int main(int argc, char *argv[])
             Vector u_curr(*U);
             Vector u_centered(U->Size());
             subtract(u_curr, u_init, u_centered);
-            bool addSample = generator->takeSample(u_centered.GetData(), t, dt);
+            bool addSample = generator->takeSample(u_centered.GetData());
         }
 
         if (done || ti % vis_steps == 0)

examples/prom/dg_advection_local_rom_matrix_interp.cpp

@@ -711,7 +711,7 @@ int main(int argc, char *argv[])
         Vector u_curr(*U);
         Vector u_centered(U->Size());
         subtract(u_curr, u_init, u_centered);
-        bool addSample = generator->takeSample(u_centered.GetData(), t, dt);
+        bool addSample = generator->takeSample(u_centered.GetData());
     }
 
     if (online)
@@ -723,11 +723,11 @@ int main(int argc, char *argv[])
             CAROM::BasisReader reader(basisName);
             if (rdim != -1)
             {
-                spatialbasis = reader.getSpatialBasis(0.0, rdim);
+                spatialbasis = reader.getSpatialBasis(rdim);
             }
             else
             {
-                spatialbasis = reader.getSpatialBasis(0.0, ef);
+                spatialbasis = reader.getSpatialBasis(ef);
             }
             numRowRB = spatialbasis->numRows();
             numColumnRB = spatialbasis->numColumns();
@@ -819,7 +819,7 @@ int main(int argc, char *argv[])
                 CAROM::BasisReader reader(parametricBasisName);
 
                 MFEM_VERIFY(rdim != -1, "rdim must be used for interpolation.");
-                CAROM::Matrix* parametricSpatialBasis = reader.getSpatialBasis(0.0, rdim);
+                CAROM::Matrix* parametricSpatialBasis = reader.getSpatialBasis(rdim);
                 numRowRB = parametricSpatialBasis->numRows();
                 numColumnRB = parametricSpatialBasis->numColumns();
                 bases.push_back(parametricSpatialBasis);
@@ -932,7 +932,7 @@ int main(int argc, char *argv[])
             Vector u_curr(*U);
             Vector u_centered(U->Size());
             subtract(u_curr, u_init, u_centered);
-            bool addSample = generator->takeSample(u_centered.GetData(), t, dt);
+            bool addSample = generator->takeSample(u_centered.GetData());
         }
 
         if (done || ti % vis_steps == 0)

examples/prom/grad_div_global_rom.cpp

@@ -358,7 +358,7 @@ int main(int argc, char *argv[])
         // 18. take and write snapshot for ROM
         if (offline)
         {
-            generator->takeSample(X.GetData(), 0.0, 0.01);
+            generator->takeSample(X.GetData());
             generator->writeSnapshot();
             delete generator;
             delete options;
@@ -370,7 +370,7 @@ int main(int argc, char *argv[])
         // 20. read the reduced basis
         assembleTimer.Start();
         CAROM::BasisReader reader(basisName);
-        const CAROM::Matrix* spatialbasis = reader.getSpatialBasis(0.0);
+        const CAROM::Matrix* spatialbasis = reader.getSpatialBasis();
         const int numRowRB = spatialbasis->numRows();
         const int numColumnRB = spatialbasis->numColumns();
         if (myid == 0) printf("spatial basis dimension is %d x %d\n", numRowRB,

examples/prom/linear_elasticity_global_rom.cpp

@@ -367,7 +367,7 @@ int main(int argc, char* argv[])
         // 18. take and write snapshot for ROM
         if (offline)
         {
-            bool addSample = generator->takeSample(X.GetData(), 0.0, 0.01);
+            bool addSample = generator->takeSample(X.GetData());
             generator->writeSnapshot();
             delete generator;
             delete options;
@@ -379,7 +379,7 @@ int main(int argc, char* argv[])
         // 20. read the reduced basis
         assembleTimer.Start();
         CAROM::BasisReader reader(basisName);
-        const CAROM::Matrix* spatialbasis = reader.getSpatialBasis(0.0);
+        const CAROM::Matrix* spatialbasis = reader.getSpatialBasis();
         numRowRB = spatialbasis->numRows();
         numColumnRB = spatialbasis->numColumns();
         printf("On rank %d, spatial basis dimension is %d x %d\n", myid,

examples/prom/maxwell_global_rom.cpp

@@ -348,7 +348,7 @@ int main(int argc, char *argv[])
         // 18. take and write snapshot for ROM
         if (offline)
         {
-            bool addSample = generator->takeSample(X.GetData(), 0.0, 0.01);
+            bool addSample = generator->takeSample(X.GetData());
             generator->writeSnapshot();
             delete generator;
             delete options;
@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
         // 20. read the reduced basis
         assembleTimer.Start();
         CAROM::BasisReader reader(basisName);
-        spatialbasis = reader.getSpatialBasis(0.0);
+        spatialbasis = reader.getSpatialBasis();
         numRowRB = spatialbasis->numRows();
         numColumnRB = spatialbasis->numColumns();
         if (myid == 0) printf("spatial basis dimension is %d x %d\n", numRowRB,

examples/prom/maxwell_local_rom_greedy.cpp

@@ -469,7 +469,7 @@ int main(int argc, char *argv[])
             // 19. take and write snapshot for ROM
             if (offline)
             {
-                bool addSample = generator->takeSample(X.GetData(), 0.0, 0.01);
+                bool addSample = generator->takeSample(X.GetData());
                 generator->writeSnapshot();
                 basisIdentifiers.push_back(saveBasisName);
                 delete generator;
@@ -482,7 +482,7 @@ int main(int argc, char *argv[])
             // 21. read the reduced basis
             assembleTimer.Start();
             CAROM::BasisReader reader(loadBasisName);
-            spatialbasis = reader.getSpatialBasis(0.0);
+            spatialbasis = reader.getSpatialBasis();
             numRowRB = spatialbasis->numRows();
             numColumnRB = spatialbasis->numColumns();
             if (myid == 0) printf("spatial basis dimension is %d x %d\n", numRowRB,

examples/prom/mixed_nonlinear_diffusion.cpp

@@ -918,7 +918,7 @@ int main(int argc, char *argv[])
     if (online)
     {
         CAROM::BasisReader readerR("basisR");
-        BR_librom = readerR.getSpatialBasis(0.0);
+        BR_librom = readerR.getSpatialBasis();
         if (rrdim == -1)
             rrdim = BR_librom->numColumns();
         else
@@ -931,7 +931,7 @@ int main(int argc, char *argv[])
             printf("reduced R dim = %d\n",rrdim);
 
         CAROM::BasisReader readerW("basisW");
-        BW_librom = readerW.getSpatialBasis(0.0);
+        BW_librom = readerW.getSpatialBasis();
         if (rwdim == -1)
             rwdim = BW_librom->numColumns();
         else
@@ -953,7 +953,7 @@ int main(int argc, char *argv[])
         */
 
         CAROM::BasisReader readerFR("basisFR");
-        FR_librom = readerFR.getSpatialBasis(0.0);
+        FR_librom = readerFR.getSpatialBasis();
 
         if (nldim == -1)
         {
@@ -1041,7 +1041,7 @@ int main(int argc, char *argv[])
             if (hyperreduce_source)
             {
                 readerS = new CAROM::BasisReader("basisS");
-                S_librom = readerS->getSpatialBasis(0.0);
+                S_librom = readerS->getSpatialBasis();
 
                 if (nsdim == -1)
                 {
@@ -1214,7 +1214,7 @@ int main(int argc, char *argv[])
             if (sampleW && hyperreduce_source)
             {
                 oper.GetSource(source);
-                basis_generator_S->takeSample(source.GetData(), t, dt);
+                basis_generator_S->takeSample(source.GetData());
                 // TODO: dfdt? In this example, one can implement the exact formula.
                 //   In general, one can use finite differences in time (dpdt is computed that way).
                 //basis_generator_S->computeNextSampleTime(p.GetData(), dfdt.GetData(), t);
@@ -1224,21 +1224,21 @@ int main(int argc, char *argv[])
             {
                 oper.CopyDpDt(dpdt);
 
-                basis_generator_R->takeSample(p.GetData(), t, dt);
+                basis_generator_R->takeSample(p.GetData());
                 basis_generator_R->computeNextSampleTime(p.GetData(), dpdt.GetData(), t);
 
                 Vector p_R(p.GetData(), N1);
                 Vector Mp(N1);
                 oper.SetParameters(p);
                 oper.Mult_Mmat(p_R, Mp);
-                basis_generator_FR->takeSample(Mp.GetData(), t, dt);
+                basis_generator_FR->takeSample(Mp.GetData());
             }
 
             if (sampleW)
             {
                 oper.CopyDpDt_W(dpdt);
 
-                basis_generator_W->takeSample(p_W->GetData(), t, dt);
+                basis_generator_W->takeSample(p_W->GetData());
                 basis_generator_W->computeNextSampleTime(p_W->GetData(), dpdt.GetData(), t);
             }
         }
@@ -1403,13 +1403,13 @@ int main(int argc, char *argv[])
         oper.CopyDpDt(dpdt);
 
         // R space
-        basis_generator_R->takeSample(p.GetData(), t, dt);
+        basis_generator_R->takeSample(p.GetData());
 
         Vector p_R(p.GetData(), N1);
         Vector Mp(N1);
         oper.SetParameters(p);
         oper.Mult_Mmat(p_R, Mp);
-        basis_generator_FR->takeSample(Mp.GetData(), t, dt);
+        basis_generator_FR->takeSample(Mp.GetData());
 
         // Terminate the sampling and write out information.
         basis_generator_R->writeSnapshot();
@@ -1418,14 +1418,14 @@ int main(int argc, char *argv[])
         // W space
 
         // TODO: why call computeNextSampleTime if you just do takeSample on every step anyway?
-        basis_generator_W->takeSample(p_W->GetData(), t, dt);
+        basis_generator_W->takeSample(p_W->GetData());
         basis_generator_W->writeSnapshot();
 
         oper.GetSource(source);
 
         if (hyperreduce_source)
         {
-            basis_generator_S->takeSample(source.GetData(), t, dt);
+            basis_generator_S->takeSample(source.GetData());
             basis_generator_S->writeSnapshot();
         }
 

examples/prom/nonlinear_elasticity_global_rom.cpp

@@ -900,7 +900,7 @@ int main(int argc, char *argv[])
             readerV = new CAROM::BasisReader("basisV");
         }
 
-        BV_librom = readerV->getSpatialBasis(0.0);
+        BV_librom = readerV->getSpatialBasis();
 
         if (rvdim == -1) // Change rvdim
             rvdim = BV_librom->numColumns();
@@ -914,7 +914,7 @@ int main(int argc, char *argv[])
             printf("reduced V dim = %d\n", rvdim);
 
         CAROM::BasisReader readerX("basisX");
-        BX_librom = readerX.getSpatialBasis(0.0);
+        BX_librom = readerX.getSpatialBasis();
 
         if (rxdim == -1) // Change rxdim
             rxdim = BX_librom->numColumns();
@@ -929,7 +929,7 @@ int main(int argc, char *argv[])
 
         // Hyper reduce H
         CAROM::BasisReader readerH("basisH");
-        H_librom = readerH.getSpatialBasis(0.0);
+        H_librom = readerH.getSpatialBasis();
 
         // Compute sample points
         if (hdim == -1)
@@ -1262,23 +1262,25 @@ int main(int argc, char *argv[])
             }
 
             // Take samples
+            // NOTE(kevin): I don't know why this example checks next sample time.
+            // IncrementalSVD is never turned on in this example and isNextSample is always true.
             if (x_base_only == false && basis_generator_v->isNextSample(t))
             {
-                basis_generator_v->takeSample(vx_diff.GetBlock(0), t, dt);
+                basis_generator_v->takeSample(vx_diff.GetBlock(0));
                 basis_generator_v->computeNextSampleTime(vx_diff.GetBlock(0),
                         dvdt.GetData(), t);
-                basis_generator_H->takeSample(oper.H_sp.GetData(), t, dt);
+                basis_generator_H->takeSample(oper.H_sp.GetData());
             }
 
             if (basis_generator_x->isNextSample(t))
             {
-                basis_generator_x->takeSample(vx_diff.GetBlock(1), t, dt);
+                basis_generator_x->takeSample(vx_diff.GetBlock(1));
                 basis_generator_x->computeNextSampleTime(vx_diff.GetBlock(1),
                         dxdt.GetData(), t);
 
                 if (x_base_only == true)
                 {
-                    basis_generator_H->takeSample(oper.H_sp.GetData(), t, dt);
+                    basis_generator_H->takeSample(oper.H_sp.GetData());
                 }
             }
         }
@@ -1363,16 +1365,16 @@ int main(int argc, char *argv[])
         // Take samples
         if (x_base_only == false)
         {
-            basis_generator_v->takeSample(vx_diff.GetBlock(0), t, dt);
+            basis_generator_v->takeSample(vx_diff.GetBlock(0));
             basis_generator_v->writeSnapshot();
             delete basis_generator_v;
         }
 
-        basis_generator_H->takeSample(oper.H_sp.GetData(), t, dt);
+        basis_generator_H->takeSample(oper.H_sp.GetData());
         basis_generator_H->writeSnapshot();
         delete basis_generator_H;
 
-        basis_generator_x->takeSample(vx_diff.GetBlock(1), t, dt);
+        basis_generator_x->takeSample(vx_diff.GetBlock(1));
         basis_generator_x->writeSnapshot();
         delete basis_generator_x;
 

examples/prom/poisson_global_rom.cpp

@@ -341,7 +341,7 @@ int main(int argc, char *argv[])
         // 18. take and write snapshot for ROM
         if (offline)
         {
-            bool addSample = generator->takeSample(X.GetData(), 0.0, 0.01);
+            bool addSample = generator->takeSample(X.GetData());
             generator->writeSnapshot();
             delete generator;
             delete options;
@@ -353,7 +353,7 @@ int main(int argc, char *argv[])
         // 20. read the reduced basis
         assembleTimer.Start();
         CAROM::BasisReader reader(basisName);
-        spatialbasis = reader.getSpatialBasis(0.0);
+        spatialbasis = reader.getSpatialBasis();
         numRowRB = spatialbasis->numRows();
         numColumnRB = spatialbasis->numColumns();
         if (myid == 0) printf("spatial basis dimension is %d x %d\n", numRowRB,