Merge pull request #162 from yencal/main

Bug fix and enhancement
lanl · Feb 8, 2024 · 772fc5b · 772fc5b
2 parents 4bfb34c + 20dad80
commit 772fc5b
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 9 deletions.
diff --git a/src/EVP/src/CMakeLists.txt b/src/EVP/src/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(SRC_Files UserEOSModel.cpp UserStrengthModel.cpp init_state_vars.cpp chg_basis.cpp evpal.cpp)
 add_library(user_material_models OBJECT ${SRC_Files})
 target_include_directories(user_material_models PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(user_material_models Elements)
diff --git a/src/EVP/src/init_state_vars.cpp b/src/EVP/src/init_state_vars.cpp
@@ -32,7 +32,7 @@ std::vector<std::string> split (std::string s, std::string delimiter);
 void init_state_vars(
   const DCArrayKokkos <material_t> &material,
   const DViewCArrayKokkos <size_t> &elem_mat_id,
-  const DCArrayKokkos <double> &state_vars,
+  DCArrayKokkos <double> &state_vars,
   const DCArrayKokkos <double> &global_vars,
   const DCArrayKokkos <double> &elem_user_output_vars,
   const size_t num_elems)
@@ -412,7 +412,7 @@ void init_state_vars(
   //});
 	}
   Kokkos::fence();
-  //state_vars.update_host();
+  state_vars.update_host();
 
     printf("user_mat_init completed\n");
 

diff --git a/src/EVPFFT/src/Fierro-EVPFFT-Link/init_state_vars.cpp b/src/EVPFFT/src/Fierro-EVPFFT-Link/init_state_vars.cpp
@@ -6,7 +6,7 @@ using namespace mtr;
 void init_state_vars(
   const DCArrayKokkos <material_t> &material,
   const DViewCArrayKokkos <size_t> &elem_mat_id,
-  const DCArrayKokkos <double> &state_vars,
+  DCArrayKokkos <double> &state_vars,
   const DCArrayKokkos <double> &global_vars,
   const DCArrayKokkos <double> &elem_user_output_vars,
   const size_t num_elems)
@@ -20,6 +20,7 @@ void init_state_vars(
             state_vars.host(elem_gid,var) = 0.0;
         }
     }
+    state_vars.update_device();
 
 	  return;
 }
diff --git a/src/LS-EVPFFT/src/Fierro-LS-EVPFFT-Link/init_state_vars.cpp b/src/LS-EVPFFT/src/Fierro-LS-EVPFFT-Link/init_state_vars.cpp
@@ -6,7 +6,7 @@ using namespace mtr;
 void init_state_vars(
   const DCArrayKokkos <material_t> &material,
   const DViewCArrayKokkos <size_t> &elem_mat_id,
-  const DCArrayKokkos <double> &state_vars,
+  DCArrayKokkos <double> &state_vars,
   const DCArrayKokkos <double> &global_vars,
   const DCArrayKokkos <double> &elem_user_output_vars,
   const size_t num_elems)
@@ -20,6 +20,7 @@ void init_state_vars(
             state_vars.host(elem_gid,var) = 0.0;
         }
     }
+    state_vars.update_device();
 
 	  return;
 }
diff --git a/src/Parallel-Solvers/Material-Models/Ideal-Gas-Models/init_state_vars.cpp b/src/Parallel-Solvers/Material-Models/Ideal-Gas-Models/init_state_vars.cpp
@@ -6,7 +6,7 @@ using namespace mtr;
 void init_state_vars(
   const DCArrayKokkos <material_t> &material,
   const DViewCArrayKokkos <size_t> &elem_mat_id,
-  const DCArrayKokkos <double> &state_vars,
+  DCArrayKokkos <double> &state_vars,
   const DCArrayKokkos <double> &global_vars,
   const DCArrayKokkos <double> &elem_user_output_vars,
   const size_t num_elems)
@@ -20,6 +20,7 @@ void init_state_vars(
             state_vars.host(elem_gid,var) = 0.0;
         }
     }
+    state_vars.update_device();
 
 	  return;
 }
diff --git a/src/Parallel-Solvers/Material-Models/User-Material-Models/init_state_vars.cpp b/src/Parallel-Solvers/Material-Models/User-Material-Models/init_state_vars.cpp
@@ -6,7 +6,7 @@ using namespace mtr;
 void init_state_vars(
   const DCArrayKokkos <material_t> &material,
   const DViewCArrayKokkos <size_t> &elem_mat_id,
-  const DCArrayKokkos <double> &state_vars,
+  DCArrayKokkos <double> &state_vars,
   const DCArrayKokkos <double> &global_vars,
   const DCArrayKokkos <double> &elem_user_output_vars,
   const size_t num_elems)
@@ -20,6 +20,7 @@ void init_state_vars(
             state_vars.host(elem_gid,var) = 0.0;
         }
     }
+    state_vars.update_device();
 
 	  return;
 }
diff --git a/src/Parallel-Solvers/Material-Models/material_models.h b/src/Parallel-Solvers/Material-Models/material_models.h
@@ -143,7 +143,7 @@ struct strength_t {
 void init_state_vars(
   const DCArrayKokkos <material_t> &material,
   const DViewCArrayKokkos <size_t> &elem_mat_id,
-  const DCArrayKokkos <double> &state_vars,
+  DCArrayKokkos <double> &state_vars,
   const DCArrayKokkos <double> &global_vars,
   const DCArrayKokkos <double> &elem_user_output_vars,
   const size_t num_elems);

diff --git a/...rallel-Solvers/Parallel-Explicit/Dynamic_Elastic_Solver/FEA_Module_Dynamic_Elasticity.cpp b/...rallel-Solvers/Parallel-Explicit/Dynamic_Elastic_Solver/FEA_Module_Dynamic_Elasticity.cpp
@@ -1054,7 +1054,6 @@ void FEA_Module_Dynamic_Elasticity::setup(){
                     global_vars,
                     elem_user_output_vars,
                     rnum_elem);
-    state_vars.update_device();
 
     // initialize strength model
     init_strength_model(elem_strength,

diff --git a/src/Parallel-Solvers/Parallel-Explicit/SGH_Solver/FEA_Module_SGH.cpp b/src/Parallel-Solvers/Parallel-Explicit/SGH_Solver/FEA_Module_SGH.cpp
@@ -1094,7 +1094,6 @@ void FEA_Module_SGH::setup(){
                     global_vars,
                     elem_user_output_vars,
                     rnum_elem);
-    state_vars.update_device();
 
     // initialize strength model
     init_strength_model(elem_strength,