Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvment and bugfixing in CFiniteElementVec #105

Merged
merged 15 commits into from
Aug 7, 2018
Merged

Improvment and bugfixing in CFiniteElementVec #105

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1cebaf5
Removed the negative meaning of Biot constant, which improved the str…
wenqing Jun 15, 2018
295a354
H2M: only compute one pressure coupled matrix for the staggered scheme
wenqing Jun 15, 2018
1322905
Changed the name and the calcualtion the wetting phase saturation in …
wenqing Jun 15, 2018
c95c0b1
H_usM: Repace the element constant saturation with node saturations
wenqing Jun 15, 2018
6b1788c
CFiniteElementVec::Flow_Type: changed its type enum and its name to _…
wenqing Jun 15, 2018
2eaf153
CRFProcessDeformation: Use the existing member InitialNodeValueHpcs()
wenqing Jun 15, 2018
00db87e
Minor changes in the caculation of swelling models in CFiniteElementVec
wenqing Jun 18, 2018
2dc716d
Little improvement in CFiniteElementVec::ComputeMatrix_RHS
wenqing Jun 20, 2018
f6d1054
Fixed the excavation conditions for the time stepping excavation mode…
wenqing Jun 22, 2018
5167f72
Removed one compilation warning and corrected some indentations
wenqing Jun 25, 2018
c4744fd
Fixed a bug in the assemble of RHS for the Newton scheme for H2M
wenqing Jun 29, 2018
a4bc2d4
[CFiniteElementVec] Comments and a correction according to Nori's com…
wenqing Aug 1, 2018
9fa57f0
[CRFProcess] Added a member to check the excavation status of point
wenqing Aug 1, 2018
efe1ed9
[CFiniteElementVec] Corrected spelling in comments
wenqing Aug 1, 2018
5943ad3
[CFiniteElementVec::LocalAssembly] Use isPointInExcavatedDomain avoid…
wenqing Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions FEM/fem_ele_std.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8535,7 +8535,7 @@ void CFiniteElementStd::Assemble_strainCPL(const int phase)
NodalVal4[i] = -fac * (dm_pcs->GetNodeValue(nodes[i], Idx_dm1[2])
- dm_pcs->GetNodeValue(nodes[i], Idx_dm0[2]));
}
else if (Residual == 1) // Mono
else if (Residual == 1) // Mono and plastic

// du is stored in u_0
for (i = 0; i < nnodesHQ; i++)
Expand Down Expand Up @@ -10630,14 +10630,15 @@ void CFiniteElementStd::Assemble_RHS_M()
for (i = nnodes; i < nnodesHQ; i++)
nodes[i] = MeshElement->nodes_index[i];

if (dm_pcs->type == 42) // Monolitihc scheme.
// If monolithic scheme and plastic deformation.
if (dm_pcs->type == 42 && pcs_deformation > 100)

for (i = 0; i < nnodesHQ; i++)
{
NodalVal2[i] = dm_pcs->GetNodeValue(nodes[i], Idx_dm1[0]);
NodalVal3[i] = dm_pcs->GetNodeValue(nodes[i], Idx_dm1[1]);
NodalVal2[i] = dm_pcs->GetNodeValue(nodes[i], Idx_dm0[0]);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed a bug in the monolithic H2M.

NodalVal3[i] = dm_pcs->GetNodeValue(nodes[i], Idx_dm0[1]);
if (dim == 3) // 3D.
NodalVal4[i] = dm_pcs->GetNodeValue(nodes[i], Idx_dm1[2]);
NodalVal4[i] = dm_pcs->GetNodeValue(nodes[i], Idx_dm0[2]);
}
else
for (i = 0; i < nnodesHQ; i++)
Expand Down
Loading