Fix bugs after rebase

adamantine-sim · Jan 30, 2024 · 3e6ea0d · 3e6ea0d
1 parent c09454c
commit 3e6ea0d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/ci/jenkins_config b/ci/jenkins_config
@@ -6,7 +6,6 @@ pipeline {
     timeout(time: 6, unit: 'HOURS')
   }
 
-<<<<<<< HEAD
   triggers {
     issueCommentTrigger('.*test this please.*')
   }
@@ -98,27 +97,28 @@ pipeline {
                 alwaysPull true
                 label 'nvidia-docker && volta'
             }
-            steps {
-              sh 'rm -rf build && mkdir -p build'
-                dir('build') {
-                  sh '''#!/bin/bash
-                    cmake \
-                    -D CMAKE_BUILD_TYPE=Debug \
-                    -D ADAMANTINE_ENABLE_TESTS=ON \
-                    -D ADAMANTINE_ENABLE_COVERAGE=OFF \
-                    -D CMAKE_CXX_FLAGS="-Wall -Wextra" \
-                    -D DEAL_II_DIR=${DEAL_II_DIR} \
-                    ..
-                  '''
-                  sh 'make -j8'
-                  sh 'ctest --no-compress-output -R test_ -T Test'
-                }
-            }
-            post {
-              always {
-                xunit([CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)])
+          }
+          steps {
+            sh 'rm -rf build && mkdir -p build'
+              dir('build') {
+                sh '''#!/bin/bash
+                  cmake \
+                  -D CMAKE_BUILD_TYPE=Debug \
+                  -D ADAMANTINE_ENABLE_TESTS=ON \
+                  -D ADAMANTINE_ENABLE_COVERAGE=OFF \
+                  -D CMAKE_CXX_FLAGS="-Wall -Wextra" \
+                  -D DEAL_II_DIR=${DEAL_II_DIR} \
+                  ..
+                '''
+                sh 'make -j8'
+                sh 'ctest --no-compress-output -R test_ -T Test'
               }
           }
+          post {
+            always {
+              xunit([CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)])
+            }
+          }
         }
       }
     }

diff --git a/source/MaterialProperty.templates.hh b/source/MaterialProperty.templates.hh
@@ -928,16 +928,16 @@ void MaterialProperty<dim, MemorySpaceType>::fill_properties(
             double infinity = std::numeric_limits<double>::infinity();
             if (_use_table)
             {
-              mechanical_property_tables_host_view(
+              _mechanical_properties_tables_host(
                   material_id, p - g_n_thermal_state_properties, 0, 0) =
                   infinity;
-              mechanical_property_tables_host_view(
+              _mechanical_properties_tables_host(
                   material_id, p - g_n_thermal_state_properties, 0, 1) =
                   infinity;
             }
             else
             {
-              mechanical_property_polynomials_host_view(
+              _mechanical_properties_polynomials_host(
                   material_id, p - g_n_thermal_state_properties, 0) = infinity;
             }
           }

diff --git a/source/PostProcessor.cc b/source/PostProcessor.cc
@@ -79,6 +79,7 @@ PostProcessor<dim>::PostProcessor(
       database.get<unsigned int>("additional_output_refinement", 0);
 }
 
+template <int dim>
 void PostProcessor<dim>::write_pvd() const
 {
   std::ofstream output(_filename_prefix + ".pvd");