Merge branch 'misc-fixes' into 'master'

Some misc. fixes See merge request ogs/ogs!5061
ufz · Aug 5, 2024 · 9fdef1a · 9fdef1a
2 parents 3581471 + 58e5267
commit 9fdef1a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5,661 deletions.
diff --git a/Applications/ApplicationsLib/Simulation.h b/Applications/ApplicationsLib/Simulation.h
@@ -38,8 +38,8 @@ class Simulation final
  bool nonfatal, std::string const& outdir, std::string const& mesh_dir,
  std::string const& script_dir, bool write_prj);
 
- double currentTime() const;
- double endTime() const;
+ OGS_EXPORT_SYMBOL double currentTime() const;
+ OGS_EXPORT_SYMBOL double endTime() const;
  OGS_EXPORT_SYMBOL bool executeTimeStep();
  OGS_EXPORT_SYMBOL bool executeSimulation();
  OGS_EXPORT_SYMBOL void outputLastTimeStep() const;

diff --git a/Tests/Python/test_matrix_debug_output.py b/Tests/Python/test_matrix_debug_output.py
@@ -52,24 +52,14 @@ def check_global_matrix_output_files_exist(outdir, file_should_exist=True):
  map_filename_to_num_lines = {
  "ogs_global_matrix_cnt_001_t_0.25_pcs_0_b.vec": 243,
  "ogs_global_matrix_cnt_001_t_0.25_pcs_0_Jac.mat": 3846,
- "ogs_global_matrix_cnt_001_t_0.25_pcs_0_K.mat": 2, # global K and M matrices are empty
- "ogs_global_matrix_cnt_001_t_0.25_pcs_0_M.mat": 2,
  "ogs_global_matrix_cnt_002_t_0.25_pcs_0_b.vec": 243,
  "ogs_global_matrix_cnt_002_t_0.25_pcs_0_Jac.mat": 3846,
- "ogs_global_matrix_cnt_002_t_0.25_pcs_0_K.mat": 2,
- "ogs_global_matrix_cnt_002_t_0.25_pcs_0_M.mat": 2,
  "ogs_global_matrix_cnt_003_t_0.5_pcs_0_b.vec": 243,
  "ogs_global_matrix_cnt_003_t_0.5_pcs_0_Jac.mat": 3846,
- "ogs_global_matrix_cnt_003_t_0.5_pcs_0_K.mat": 2,
- "ogs_global_matrix_cnt_003_t_0.5_pcs_0_M.mat": 2,
  "ogs_global_matrix_cnt_004_t_0.75_pcs_0_b.vec": 243,
  "ogs_global_matrix_cnt_004_t_0.75_pcs_0_Jac.mat": 3846,
- "ogs_global_matrix_cnt_004_t_0.75_pcs_0_K.mat": 2,
- "ogs_global_matrix_cnt_004_t_0.75_pcs_0_M.mat": 2,
  "ogs_global_matrix_cnt_005_t_1_pcs_0_b.vec": 243,
  "ogs_global_matrix_cnt_005_t_1_pcs_0_Jac.mat": 3846,
- "ogs_global_matrix_cnt_005_t_1_pcs_0_K.mat": 2,
- "ogs_global_matrix_cnt_005_t_1_pcs_0_M.mat": 2,
  }
 
  for f, num_lines_expected in map_filename_to_num_lines.items():

diff --git a/scripts/ci/jobs/code-coverage.yml b/scripts/ci/jobs/code-coverage.yml
@@ -4,7 +4,7 @@ code coverage:
  needs: [meta]
  variables:
  CMAKE_PRESET: coverage
- TARGETS: "tests ctest"
+ TARGETS: "all tests ctest"
  CMAKE_ARGS: >-
  -DOGS_USE_PIP=ON
  -DBUILD_SHARED_LIBS=ON

diff --git a/web/content/docs/tutorials/advancing-glacier/.gitignore b/web/content/docs/tutorials/advancing-glacier/.gitignore
@@ -1,2 +1,3 @@
 *.vtu
 glacier.pdf
+mesh_basin.msh