Fix bugs after rebase

adamantine-sim · Jan 30, 2024 · 8b24c36 · 8b24c36
1 parent c09454c
commit 8b24c36
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 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.*')
   }

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");