Release 1.1.1 (#15)

* Enable interface reconstruction in RZ geometry. * Propagate recent fixes from R3D. * Improve numeric tolerance robustness.
laristra · Apr 16, 2021 · f5fe762 · f5fe762
1 parent a475ae4
commit f5fe762
Show file tree

Hide file tree

Showing 39 changed files with 970 additions and 190 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ cmake_policy(SET CMP0074 NEW)  # Don't ignore Pkg_ROOT variables
 
 set(TANGRAM_VERSION_MAJOR 1)
 set(TANGRAM_VERSION_MINOR 0)
-set(TANGRAM_VERSION_PATCH 5.pub)
+set(TANGRAM_VERSION_PATCH 4)
 
 
 # Top level target
@@ -133,7 +133,14 @@ if (ENABLE_UNIT_TESTS)
 
 endif ()
 
+#-----------------------------------------------------------------------------
+# Allow to set TANGRAM_DEBUG from the build script
+#-----------------------------------------------------------------------------
 
+option(TANGRAM_DEBUG "Additional checks will be performed and info will be printed" OFF)
+if (TANGRAM_DEBUG)
+  add_definitions(-DTANGRAM_DEBUG)
+endif()
 
 #-----------------------------------------------------------------------------
 # Recurse down the source directories building up dependencies

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 This software is open source software available under the BSD-3 License.
 
-Copyright (c) 2020, Triad National Security, LLC.
+Copyright (c) 2017, Triad National Security, LLC.
 All rights reserved.
 
 This program was produced under U.S. Government contract 89233218CNA000001 for 

diff --git a/README.md b/README.md
@@ -11,8 +11,6 @@ meshes with their materials data. Interface reconstruction algorithms
 can be customized (e.g. VOF, MOF) and, through the wrappers, take 
 advantage of hybrid parallelism (MPI+X).
 
-Release process followed in accordance to  memo number CCS-DO-344. 
-
 ## Getting Started
 
 To obtain a copy of Tangram and its submodules from GitHub, clone
@@ -142,7 +140,7 @@ export MODULEPATH=""
 . /opt/local/packages/Modules/default/init/sh
 module load intel/18.0.1 openmpi/2.1.2 cmake/3.14.0
 XMOF2D_INSTALL_PREFIX=/usr/local/codes/ngc/private/xmof2d/0.9.5-intel-18.0.1
-WONTON_INSTALL_PREFIX=/usr/local/codes/ngc/private/wonton/1.2.6-intel-18.0.1-openmpi-2.1.2
+WONTON_INSTALL_PREFIX=/usr/local/codes/ngc/private/wonton/dev-intel-18.0.1-openmpi-2.1.2
 mkdir build
 cd build
 cmake \
@@ -159,7 +157,7 @@ make -j2
 ctest --output-on-failure
 ```
 
-## Snow
+## Varan
 
 Execute the following from the Tangram root directory:
 
@@ -169,7 +167,7 @@ Execute the following from the Tangram root directory:
 
 module load intel/18.0.5 openmpi/2.1.2 cmake/3.14.0
 XMOF2D_INSTALL_PREFIX=/usr/projects/ngc/private/xmof2d/0.9.5-intel-18.0.5
-WONTON_INSTALL_PREFIX=/usr/projects/ngc/private/wonton/1.2.6-intel-18.0.5-openmpi-2.1.2
+WONTON_INSTALL_PREFIX=/usr/projects/ngc/private/wonton/dev-intel-18.0.5-openmpi-2.1.2
 mkdir build
 cd build
 cmake \

diff --git a/app/test_lvira/test_lvira_2d.cc b/app/test_lvira/test_lvira_2d.cc
@@ -153,11 +153,13 @@ int main(int argc, char** argv) {
   std::vector< std::vector< std::vector<r2d_poly> > > reference_mat_polys;
 
 #if defined(WONTON_ENABLE_Jali) && defined(WONTON_ENABLE_MPI)
-  get_material_moments<Wonton::Jali_Mesh_Wrapper>(mesh_wrapper, material_interfaces,
+  get_material_moments<Wonton::Jali_Mesh_Wrapper,Wonton::CartesianCoordinates>(
+    mesh_wrapper, material_interfaces,
     mesh_materials, cell_num_mats, cell_mat_ids, cell_mat_volfracs, cell_mat_centroids,
     vol_tol, dst_tol, decompose_cells, &reference_mat_polys, reverse_mat_order);
 #else
-  get_material_moments<Wonton::Simple_Mesh_Wrapper>(mesh_wrapper, material_interfaces,
+  get_material_moments<Wonton::Simple_Mesh_Wrapper,Wonton::CartesianCoordinates>(
+    mesh_wrapper, material_interfaces,
     mesh_materials, cell_num_mats, cell_mat_ids, cell_mat_volfracs, cell_mat_centroids,
     vol_tol, dst_tol, decompose_cells, &reference_mat_polys, reverse_mat_order);
 #endif
@@ -245,7 +247,8 @@ int main(int argc, char** argv) {
       cell_ref_mat_vols[icmat] *= cell_volume;
 
     std::vector<double> cell_mat_sym_diff_vol;
-    get_mat_sym_diff_vol(reference_mat_polys[icell], cell_ref_mat_ids,
+    get_mat_sym_diff_vol<Wonton::CartesianCoordinates>(
+                         reference_mat_polys[icell], cell_ref_mat_ids,
                          cell_ref_mat_vols, cellmatpoly_list[icell],
                          cell_mat_sym_diff_vol, !decompose_cells);
 

diff --git a/app/test_lvira/test_lvira_3d.cc b/app/test_lvira/test_lvira_3d.cc
@@ -155,11 +155,13 @@ int main(int argc, char** argv) {
   std::vector< std::vector< std::vector<r3d_poly> > > reference_mat_polys;
 
 #if defined(WONTON_ENABLE_Jali) && defined(WONTON_ENABLE_MPI)
-  get_material_moments<Wonton::Jali_Mesh_Wrapper>(mesh_wrapper, material_interfaces,
+  get_material_moments<Wonton::Jali_Mesh_Wrapper, Wonton::CartesianCoordinates>(
+    mesh_wrapper, material_interfaces,
     mesh_materials, cell_num_mats, cell_mat_ids, cell_mat_volfracs, cell_mat_centroids,
     vol_tol, dst_tol, decompose_cells, &reference_mat_polys, reverse_mat_order);
 #else
-  get_material_moments<Wonton::Simple_Mesh_Wrapper>(mesh_wrapper, material_interfaces,
+  get_material_moments<Wonton::Simple_Mesh_Wrapper, Wonton::CartesianCoordinates>(
+    mesh_wrapper, material_interfaces,
     mesh_materials, cell_num_mats, cell_mat_ids, cell_mat_volfracs, cell_mat_centroids,
     vol_tol, dst_tol, decompose_cells, &reference_mat_polys, reverse_mat_order);
 #endif

diff --git a/app/test_mof/CMakeLists.txt b/app/test_mof/CMakeLists.txt
@@ -22,6 +22,12 @@ target_link_libraries(test_single_cell_3d tangram)
 add_executable(test_mof_2d test_mof_2d.cc)
 target_link_libraries(test_mof_2d tangram)
 
+#-------------------------------------------------------------------------------
+# test_mof_2d_rz - uses 2D mesh from SimpleMesh, RZ coordinate system
+#-------------------------------------------------------------------------------
+add_executable(test_mof_2d_rz test_mof_2d_rz.cc)
+target_link_libraries(test_mof_2d_rz tangram)
+
 #-------------------------------------------------------------------------------
 # Testing
 #-------------------------------------------------------------------------------

diff --git a/app/test_mof/test/CMakeLists.txt b/app/test_mof/test/CMakeLists.txt
@@ -72,8 +72,10 @@ endmacro(ADD_MOF_2D_TEST)
 if (WONTON_ENABLE_Jali)
   ADD_MOF_2D_TEST(2)
   file(COPY voronoi124.exo DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+  ADD_MOF_2D_TEST(1_rz)
 else(WONTON_ENABLE_Jali)
   ADD_MOF_2D_TEST(0)
   ADD_MOF_2D_TEST(1)
+  ADD_MOF_2D_TEST(1_rz)
 endif(WONTON_ENABLE_Jali)
 
diff --git a/app/test_mof/test/cell_sym_diff_gold1_rz_2d.txt b/app/test_mof/test/cell_sym_diff_gold1_rz_2d.txt
@@ -0,0 +1,20 @@
+505 1.88000945908630736e-03
+515 5.98162700187310648e-04
+525 5.79192820814975959e-04
+535 5.57228567701686115e-04
+545 5.43774126782504107e-04
+556 6.19981467578920378e-04
+566 7.02727304754922899e-04
+576 6.83395026697168617e-04
+586 6.61516271301973088e-04
+596 2.51687235971954394e-03
+56 6.19981467578908235e-04
+66 7.02727304754995757e-04
+76 6.83395026697088820e-04
+86 6.61516271301881148e-04
+96 2.51687235971973997e-03
+305 1.88000945908626399e-03
+315 5.98162700187318888e-04
+325 5.79192820815074838e-04
+335 5.57228567701767430e-04
+345 5.43774126782678446e-04
diff --git a/app/test_mof/test/mof_2d_test1_rz.sh b/app/test_mof/test/mof_2d_test1_rz.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+: <<'END'
+This file is part of the Ristra tangram project.
+Please see the license file at the root of this repository, or at:
+https://github.com/laristra/tangram/blob/master/LICENSE
+END
+
+
+# Exit on error
+set -e
+# Echo each command
+set -x
+
+# 2D MOF interface reconstruction on a regular 10x10 RZ grid
+# with two planar material interfaces forming a tilted T-junction.
+# Uses SimpleMesh.
+${RUN_COMMAND} ${TESTAPPDIR}/test_mof_2d_rz 1 10 10 1
+
+# Compare the values for the field
+${CMPAPPDIR}/apptest_cmp cell_sym_diff_gold1_rz_2d.txt cell_sym_diff_2d_simple_mesh_decomposed.txt 1e-11
diff --git a/app/test_mof/test_mof_2d.cc b/app/test_mof/test_mof_2d.cc
@@ -151,11 +151,13 @@ int main(int argc, char** argv) {
   std::vector< std::vector< std::vector<r2d_poly> > > reference_mat_polys;
 
 #if defined(WONTON_ENABLE_Jali) && defined(WONTON_ENABLE_MPI)
-  get_material_moments<Wonton::Jali_Mesh_Wrapper>(mesh_wrapper, material_interfaces,
+  get_material_moments<Wonton::Jali_Mesh_Wrapper, Wonton::CartesianCoordinates>(
+    mesh_wrapper, material_interfaces,
     mesh_materials, cell_num_mats, cell_mat_ids, cell_mat_volfracs, cell_mat_centroids,
     vol_tol, dst_tol, decompose_cells, &reference_mat_polys);
 #else
-  get_material_moments<Wonton::Simple_Mesh_Wrapper>(mesh_wrapper, material_interfaces,
+  get_material_moments<Wonton::Simple_Mesh_Wrapper, Wonton::CartesianCoordinates>(
+    mesh_wrapper, material_interfaces,
     mesh_materials, cell_num_mats, cell_mat_ids, cell_mat_volfracs, cell_mat_centroids,
     vol_tol, dst_tol, decompose_cells, &reference_mat_polys);
 #endif
@@ -243,7 +245,8 @@ int main(int argc, char** argv) {
       cell_ref_mat_vols[icmat] *= cell_volume;
 
     std::vector<double> cell_mat_sym_diff_vol;
-    get_mat_sym_diff_vol(reference_mat_polys[icell], cell_ref_mat_ids,
+    get_mat_sym_diff_vol<Wonton::CartesianCoordinates>(
+                         reference_mat_polys[icell], cell_ref_mat_ids,
                          cell_ref_mat_vols, cellmatpoly_list[icell],
                          cell_mat_sym_diff_vol, !decompose_cells);