diff --git a/apps/multiphysics/regression_tests/standard_inputs/fracture_mode_1.yaml b/apps/multiphysics/regression_tests/standard_inputs/fracture_mode_1.yaml index a228bcd44..b6db7436f 100644 --- a/apps/multiphysics/regression_tests/standard_inputs/fracture_mode_1.yaml +++ b/apps/multiphysics/regression_tests/standard_inputs/fracture_mode_1.yaml @@ -135,5 +135,4 @@ initial_conditions: type: cartesian u: 0.0 v: 0.0 - w: 0.0 - + w: 0.0 \ No newline at end of file diff --git a/apps/multiphysics/regression_tests/standard_inputs/fracture_mode_2.yaml b/apps/multiphysics/regression_tests/standard_inputs/fracture_mode_2.yaml index 254e8c0e0..428db5b91 100644 --- a/apps/multiphysics/regression_tests/standard_inputs/fracture_mode_2.yaml +++ b/apps/multiphysics/regression_tests/standard_inputs/fracture_mode_2.yaml @@ -172,5 +172,4 @@ initial_conditions: type: cartesian u: 0.0 v: 0.0 - w: 0.0 - + w: 0.0 \ No newline at end of file diff --git a/apps/multiphysics/regression_tests/standard_inputs/fracture_reorientation.yaml b/apps/multiphysics/regression_tests/standard_inputs/fracture_reorientation.yaml index e817e98ce..4f80356db 100644 --- a/apps/multiphysics/regression_tests/standard_inputs/fracture_reorientation.yaml +++ b/apps/multiphysics/regression_tests/standard_inputs/fracture_reorientation.yaml @@ -42,11 +42,11 @@ boundary_conditions: type: global velocity_model: user_defined velocity_bc_global_vars: - - 1.0 # reorientation mode flag : 1.0 = enabled; 0.0 = disabled + - 1.0 # reorientation mode flag : 1.0 = enabled; 0.0 = disabled - 0.3171443868 # omega_y (rotation about x2 axis) - 0.3171443868 # omega_z (rotation about x3 axis) - - 4.0e-5 # cz opening rate (constant rate of opening for cohesive zone node pairs) - - 0.5 # x interface (cm) (x location of interface) + - 4.0e-5 # cz opening rate (constant rate of opening for cohesive zone node pairs) [cm/us] + - 0.5 # x interface (x location of interface) [cm] # fracture stress boundary condition - boundary_condition: @@ -55,25 +55,24 @@ boundary_conditions: type: global stress_model: fracture stress_bc_global_vars: - - 2.0e-3 #g/cm*us^2 #E_inf (Prony constant term) - - 0.1 #a1 (Damage evolution coefficient) dimensionless - - 0.25 #n_exp (Damage evolution exponent) dimensionless - - 5.0e-3 #cm #u_n_star (uns: Characteristic length normal) - - 5.0e-3 #cm #u_t_star (uts: Characteristic length tangential) - - 1 #num_prony_terms (Filled below: E and tau temrs) dimensionless - - 1.8e-2 #g/cm*us^2 #prony_0_E - - 2.0 #g/cm*us^3 #prony_0_tau p - #prony_1_E - #prony_1_tau - + - 2.0e-3 # E_inf (Prony constant term) [Mbar] + - 0.1 # a1 (Damage evolution coefficient) [dimensionless] + - 0.25 # n_exp (Damage evolution exponent) [dimensionless] + - 5.0e-3 # u_n_star (uns: Characteristic length normal) [cm] + - 5.0e-3 # u_t_star (uts: Characteristic length tangential) [cm] + - 1 # num_prony_terms (Filled below: # E and tau temrs) + - 1.8e-2 # prony_0_E [Mbar] + - 2.0 # prony_0_tau [us] + # prony_1_E (set by num_prony_terms) + # prony_1_tau (set by num_prony_terms) materials: - material: id: 0 eos_model_type: decoupled eos_model: linear_elastic_eos eos_global_vars: - - 1.4 # B Bulk modulus g/cm*us^2 - - 0.4333 # G Shear modulus g/cm*us^2 + - 1.4 # B Bulk modulus + - 0.4333 # G Shear modulus - 1.0 # ref density from Azo materials online - 0.001 #------Strength diff --git a/apps/multiphysics/regression_tests/standard_inputs/meshes/fracture_mode_1.vtk b/apps/multiphysics/regression_tests/standard_inputs/meshes/fracture_mode_1.vtk index 27c8ab1b6..23062c2fc 100644 --- a/apps/multiphysics/regression_tests/standard_inputs/meshes/fracture_mode_1.vtk +++ b/apps/multiphysics/regression_tests/standard_inputs/meshes/fracture_mode_1.vtk @@ -5,21 +5,21 @@ DATASET UNSTRUCTURED_GRID POINTS 16 float 0.0 0.0 0.0 -1.0 0.0 0.0 -0.0 1.0 0.0 -1.0 1.0 0.0 -0.0 0.0 1.0 -1.0 0.0 1.0 -0.0 1.0 1.0 -1.0 1.0 1.0 -0.0 0.0 1.0 -1.0 0.0 1.0 -0.0 1.0 1.0 -1.0 1.0 1.0 -0.0 0.0 2.0 -1.0 0.0 2.0 -0.0 1.0 2.0 -1.0 1.0 2.0 +0.1 0.0 0.0 +0.0 0.1 0.0 +0.1 0.1 0.0 +0.0 0.0 0.1 +0.1 0.0 0.1 +0.0 0.1 0.1 +0.1 0.1 0.1 +0.0 0.0 0.1 +0.1 0.0 0.1 +0.0 0.1 0.1 +0.1 0.1 0.1 +0.0 0.0 0.2 +0.1 0.0 0.2 +0.0 0.1 0.2 +0.1 0.1 0.2 CELLS 2 16 8 0 2 6 4 1 3 7 5 diff --git a/apps/multiphysics/regression_tests/standard_inputs/meshes/fracture_mode_2.vtk b/apps/multiphysics/regression_tests/standard_inputs/meshes/fracture_mode_2.vtk index 27c8ab1b6..23062c2fc 100644 --- a/apps/multiphysics/regression_tests/standard_inputs/meshes/fracture_mode_2.vtk +++ b/apps/multiphysics/regression_tests/standard_inputs/meshes/fracture_mode_2.vtk @@ -5,21 +5,21 @@ DATASET UNSTRUCTURED_GRID POINTS 16 float 0.0 0.0 0.0 -1.0 0.0 0.0 -0.0 1.0 0.0 -1.0 1.0 0.0 -0.0 0.0 1.0 -1.0 0.0 1.0 -0.0 1.0 1.0 -1.0 1.0 1.0 -0.0 0.0 1.0 -1.0 0.0 1.0 -0.0 1.0 1.0 -1.0 1.0 1.0 -0.0 0.0 2.0 -1.0 0.0 2.0 -0.0 1.0 2.0 -1.0 1.0 2.0 +0.1 0.0 0.0 +0.0 0.1 0.0 +0.1 0.1 0.0 +0.0 0.0 0.1 +0.1 0.0 0.1 +0.0 0.1 0.1 +0.1 0.1 0.1 +0.0 0.0 0.1 +0.1 0.0 0.1 +0.0 0.1 0.1 +0.1 0.1 0.1 +0.0 0.0 0.2 +0.1 0.0 0.2 +0.0 0.1 0.2 +0.1 0.1 0.2 CELLS 2 16 8 0 2 6 4 1 3 7 5 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_0.0000e+00.txt b/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_0.0000e+00.txt deleted file mode 100644 index e3a9b697f..000000000 --- a/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_0.0000e+00.txt +++ /dev/null @@ -1,4 +0,0 @@ -# state dump file -# x y z radius_2D radius_3D den pres sie sspd vol mass -5.000000000000e-01 5.000000000000e-01 5.000000000000e-01 7.071067811865e-01 8.660254037844e-01 1.000000000000e+00 0.000000000000e+00 1.000000000000e-10 1.370304102502e+00 1.000000000000e+00 1.000000000000e+00 -5.000000000000e-01 5.000000000000e-01 1.500000000000e+00 7.071067811865e-01 1.658312395178e+00 1.000000000000e+00 0.000000000000e+00 1.000000000000e-10 1.370304102502e+00 1.000000000000e+00 1.000000000000e+00 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_2.0000e+00.txt b/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_2.0000e+00.txt deleted file mode 100644 index 090861ef0..000000000 --- a/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_2.0000e+00.txt +++ /dev/null @@ -1,4 +0,0 @@ -# state dump file -# x y z radius_2D radius_3D den pres sie sspd vol mass -5.000000000000e-01 5.000000000000e-01 4.614279046017e-01 7.071067811865e-01 8.443433609292e-01 9.870488749288e-01 -1.683646259253e-02 7.838903246350e-04 1.379264724563e+00 1.013121057528e+00 1.000000000000e+00 -5.000000000000e-01 5.000000000000e-01 1.538572095398e+00 7.071067811865e-01 1.693282047604e+00 9.870488749288e-01 -1.683646259253e-02 7.838903246350e-04 1.379264724563e+00 1.013121057528e+00 1.000000000000e+00 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_2.8000e+01.txt b/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_2.8000e+01.txt new file mode 100644 index 000000000..fae716106 --- /dev/null +++ b/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_2.8000e+01.txt @@ -0,0 +1,4 @@ +# state dump file +# x y z radius_2D radius_3D den pres sie sspd vol mass +4.999999999999e-02 4.999999999999e-02 4.822753604966e-02 7.071067811865e-02 8.559144369281e-02 9.996685853770e-01 -4.308390098450e-04 7.101002888187e-07 1.370531228367e+00 1.000331524495e-03 1.000000000000e-03 +5.000000000001e-02 5.000000000001e-02 1.517724639503e-01 7.071067811866e-02 1.674361992329e-01 9.996685853770e-01 -4.308390098462e-04 7.101002888181e-07 1.370531228367e+00 1.000331524495e-03 1.000000000000e-03 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_4.0000e+00.txt b/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_4.0000e+00.txt deleted file mode 100644 index 609f206a0..000000000 --- a/apps/multiphysics/regression_tests/standard_results/fracture_mode_1/state/mat_pt_state_t_4.0000e+00.txt +++ /dev/null @@ -1,4 +0,0 @@ -# state dump file -# x y z radius_2D radius_3D den pres sie sspd vol mass -5.000000000000e-01 5.000000000000e-01 2.110171758904e-01 7.071067811865e-01 7.379215734214e-01 9.848137681597e-01 -1.974210139240e-02 2.445895370157e-02 1.380829008512e+00 1.015420409758e+00 1.000000000000e+00 -5.000000000000e-01 5.000000000000e-01 1.788982824110e+00 7.071067811865e-01 1.923657855482e+00 9.848137681597e-01 -1.974210139240e-02 2.445895370157e-02 1.380829008512e+00 1.015420409758e+00 1.000000000000e+00 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_0.0000e+00.txt b/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_0.0000e+00.txt deleted file mode 100644 index e3a9b697f..000000000 --- a/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_0.0000e+00.txt +++ /dev/null @@ -1,4 +0,0 @@ -# state dump file -# x y z radius_2D radius_3D den pres sie sspd vol mass -5.000000000000e-01 5.000000000000e-01 5.000000000000e-01 7.071067811865e-01 8.660254037844e-01 1.000000000000e+00 0.000000000000e+00 1.000000000000e-10 1.370304102502e+00 1.000000000000e+00 1.000000000000e+00 -5.000000000000e-01 5.000000000000e-01 1.500000000000e+00 7.071067811865e-01 1.658312395178e+00 1.000000000000e+00 0.000000000000e+00 1.000000000000e-10 1.370304102502e+00 1.000000000000e+00 1.000000000000e+00 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_2.0000e+00.txt b/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_2.0000e+00.txt deleted file mode 100644 index 92c3e684f..000000000 --- a/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_2.0000e+00.txt +++ /dev/null @@ -1,4 +0,0 @@ -# state dump file -# x y z radius_2D radius_3D den pres sie sspd vol mass -3.970642908565e-01 5.000000000000e-01 5.003938575859e-01 6.384826161090e-01 8.112053154307e-01 9.990735701192e-01 -1.204358844976e-03 2.786135559333e-03 1.370939289211e+00 1.000927288949e+00 1.000000000000e+00 -6.029357091434e-01 5.000000000000e-01 1.499606142414e+00 7.832824965236e-01 1.691848117216e+00 9.990735701192e-01 -1.204358844976e-03 2.786135559333e-03 1.370939289211e+00 1.000927288949e+00 1.000000000000e+00 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_3.8500e+01.txt b/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_3.8500e+01.txt new file mode 100644 index 000000000..e7b809132 --- /dev/null +++ b/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_3.8500e+01.txt @@ -0,0 +1,4 @@ +# state dump file +# x y z radius_2D radius_3D den pres sie sspd vol mass +3.986591729473e-02 5.000000000000e-02 5.083551194598e-02 6.394756728563e-02 8.169174154442e-02 9.999748597417e-01 -3.268233579884e-05 6.054384380731e-05 1.370321327726e+00 1.000025140890e-03 1.000000000000e-03 +6.013408252517e-02 5.000000000000e-02 1.491644880203e-01 7.820554891530e-02 1.684225411503e-01 9.999748597354e-01 -3.268234396901e-05 6.054384384712e-05 1.370321327730e+00 1.000025140897e-03 1.000000000000e-03 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_4.0000e+00.txt b/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_4.0000e+00.txt deleted file mode 100644 index 610dd85f1..000000000 --- a/apps/multiphysics/regression_tests/standard_results/fracture_mode_2/state/mat_pt_state_t_4.0000e+00.txt +++ /dev/null @@ -1,4 +0,0 @@ -# state dump file -# x y z radius_2D radius_3D den pres sie sspd vol mass -2.948857343329e-01 5.000000000000e-01 5.038750839585e-01 5.804804874525e-01 7.686661801766e-01 9.987376663465e-01 -1.641033749552e-03 5.826633224063e-03 1.371169812691e+00 1.001263929154e+00 1.000000000000e+00 -7.051142656671e-01 5.000000000000e-01 1.496124916041e+00 8.643992871626e-01 1.727881909173e+00 9.987376663465e-01 -1.641033749553e-03 5.826633224063e-03 1.371169812691e+00 1.001263929154e+00 1.000000000000e+00 diff --git a/apps/multiphysics/regression_tests/standard_results/fracture_reorientation/state/mat_pt_state_t_0.0000e+00.txt b/apps/multiphysics/regression_tests/standard_results/fracture_reorientation/state/mat_pt_state_t_0.0000e+00.txt deleted file mode 100644 index cffc70e0e..000000000 --- a/apps/multiphysics/regression_tests/standard_results/fracture_reorientation/state/mat_pt_state_t_0.0000e+00.txt +++ /dev/null @@ -1,4 +0,0 @@ -# state dump file -# x y z radius_2D radius_3D den pres sie sspd vol mass -2.500000000000e-01 5.000000000000e-01 5.000000000000e-01 5.590169943749e-01 7.500000000000e-01 1.000000000000e+00 0.000000000000e+00 1.000000000000e-10 1.406319072378e+00 5.000000000000e-01 5.000000000000e-01 -7.500000000000e-01 5.000000000000e-01 5.000000000000e-01 9.013878188660e-01 1.030776406404e+00 1.000000000000e+00 0.000000000000e+00 1.000000000000e-10 1.406319072378e+00 5.000000000000e-01 5.000000000000e-01 diff --git a/apps/multiphysics/src/Solvers/SGH_solver_3D/src/fracture.cpp b/apps/multiphysics/src/Solvers/SGH_solver_3D/src/fracture.cpp index 18f9d99eb..d1f29169e 100644 --- a/apps/multiphysics/src/Solvers/SGH_solver_3D/src/fracture.cpp +++ b/apps/multiphysics/src/Solvers/SGH_solver_3D/src/fracture.cpp @@ -1207,7 +1207,7 @@ void cohesive_zones_t::ucmap( /// \param dt_stage Stage time step used for rate/increment updates (e.g., RK stage dt). /// \param time_value Current simulation time (debugging aid; not required for the math). /// \param overlapping_node_gids 2D array of cohesive pairs (num_pairs x 2) with global node IDs [A_gid, B_gid]. -/// \param E_inf Long-term (equilibrium) modulus of the cohesive zone material [g/cm*us^2] (user input set with the fracture_stress_bc). +/// \param E_inf Long-term (equilibrium) modulus of the cohesive zone material [Mbar] (user input set with the fracture_stress_bc). /// \param a1 Damage evolution parameter [dimensionless] (user input set with the fracture_stress_bc). /// \param n_exp Damage evolution exponent [dimensionless] (user input set with the fracture_stress_bc). /// \param u_n_star Normal characteristic length [cm] (user input set with the fracture_stress_bc). @@ -1242,9 +1242,11 @@ void cohesive_zones_t::cohesive_zone_var_update( return; } - // loop over each cohesive zone node pair - RUN({ - for (size_t i = 0; i < overlapping_node_gids.dims(0); i++){ + // capture loop bound on host so it's a part of the FOR_ALL signature + const size_t npairs = overlapping_node_gids.dims(0); + + // paralll loop over each cohesive zone node pair + FOR_ALL(i, 0, npairs, { // stage-effective modulus: E_inf + Prony contribution double E_dt = E_inf; @@ -1274,7 +1276,7 @@ void cohesive_zones_t::cohesive_zone_var_update( for (int j = 0; j < num_prony_terms; ++j) { delta_internal_vars(i, 4 + j) = internal_vars(i, 4 + j); } - continue; + return; } const double lambda_dot_t = (lambda_tdt - lambda_t) / dt_stage; delta_internal_vars(i,0) = lambda_dot_t; // lambda rate at t @@ -1352,8 +1354,8 @@ void cohesive_zones_t::cohesive_zone_var_update( // delta_internal_vars(i,2) : normal traction increment // delta_internal_vars(i,3) : tangential traction increment // delta_internal_vars(i, 4 + j) : prony internal variables - } - }); // end RUN + + }); // end FOR_ALL Kokkos::fence(); } diff --git a/apps/multiphysics/src/Solvers/SGH_solver_3D/src/sgh_setup.cpp b/apps/multiphysics/src/Solvers/SGH_solver_3D/src/sgh_setup.cpp index a585e5a10..de4e61db0 100644 --- a/apps/multiphysics/src/Solvers/SGH_solver_3D/src/sgh_setup.cpp +++ b/apps/multiphysics/src/Solvers/SGH_solver_3D/src/sgh_setup.cpp @@ -179,4 +179,4 @@ void SGH3D::setup(SimulationParameters_t& SimulationParamaters, } -} // end SGH setup +} // end SGH setup \ No newline at end of file