fixing cuda bugs

lanl · Aug 5, 2024 · f2620c2 · f2620c2
1 parent 97e2008
commit f2620c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/single-node-refactor/src/Solvers/SGH_solver/src/properties.cpp b/single-node-refactor/src/Solvers/SGH_solver/src/properties.cpp
@@ -82,7 +82,7 @@ void SGH::update_state(
 
 
     // --- pressure ---
-    if (Materials.MaterialEnums(mat_id).EOSType == model::decoupledEOSType) {
+    if (Materials.MaterialEnums.host(mat_id).EOSType == model::decoupledEOSType) {
 
         // loop over all the elements the material lives in
         FOR_ALL(mat_elem_lid, 0, num_material_elems, {

diff --git a/single-node-refactor/src/input/parse_yaml.cpp b/single-node-refactor/src/input/parse_yaml.cpp
@@ -1611,19 +1611,23 @@ void parse_materials(Yaml::Node& root, Material_t& Materials)
                             RUN({
                                 Materials.MaterialEnums(mat_id).EOSType = model::decoupledEOSType;
                             });
+
+                            Materials.MaterialEnums.host(mat_id).EOSType = model::decoupledEOSType;
                             break;
 
                         case model::coupledEOSType:
                             std::cout << "Setting EOS type to coupled " << std::endl;
                             RUN({
                                 Materials.MaterialEnums(mat_id).EOSType = model::coupledEOSType;
                             });
+                            Materials.MaterialEnums.host(mat_id).EOSType = model::coupledEOSType;
                             break;
 
                         default:
                             RUN({ 
                                 Materials.MaterialEnums(mat_id).EOSType = model::noEOSType;
                             });
+                            Materials.MaterialEnums.host(mat_id).EOSType = model::noEOSType;
                             std::cout << "ERROR: No valid EOS type input " << std::endl;
                             std::cout << "Valid EOS types are: " << std::endl;
 
@@ -1717,6 +1721,7 @@ void parse_materials(Yaml::Node& root, Material_t& Materials)
                             RUN({
                                 Materials.MaterialEnums(mat_id).StrengthType = model::noStrengthType;
                             });
+                            Materials.MaterialEnums.host(mat_id).StrengthType = model::noStrengthType;
                             if (VERBOSE) {
                                 std::cout << "\tstrength_model_type_type = " << strength_model_type << std::endl;
                             }
@@ -1726,6 +1731,7 @@ void parse_materials(Yaml::Node& root, Material_t& Materials)
                             RUN({
                                 Materials.MaterialEnums(mat_id).StrengthType = model::incrementBased;
                             });
+                            Materials.MaterialEnums.host(mat_id).StrengthType = model::incrementBased;
 
                             if (VERBOSE) {
                                 std::cout << "\tstrength_model_type = " << strength_model_type << std::endl;
@@ -1735,6 +1741,8 @@ void parse_materials(Yaml::Node& root, Material_t& Materials)
                             RUN({
                                 Materials.MaterialEnums(mat_id).StrengthType = model::stateBased;
                             });
+                            Materials.MaterialEnums.host(mat_id).StrengthType = model::stateBased;
+
                             std::cout << "ERROR: state_based models not yet defined: " << std::endl;
                             throw std::runtime_error("**** ERROR: state_based models not yet defined ****");
                             if (VERBOSE) {