Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wenqing
ogs
Commits
8018dc15
Commit
8018dc15
authored
7 years ago
by
Dmitri Naumov
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1853 from wenqing/fixing_test
Fix two parallel tests
parents
383da63c
2ab84e99
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NumLib/ODESolver/NonlinearSolver.cpp
+2
-1
2 additions, 1 deletion
NumLib/ODESolver/NonlinearSolver.cpp
Tests/Data
+1
-1
1 addition, 1 deletion
Tests/Data
with
3 additions
and
2 deletions
NumLib/ODESolver/NonlinearSolver.cpp
+
2
−
1
View file @
8018dc15
...
...
@@ -188,7 +188,6 @@ bool NonlinearSolver<NonlinearSolverTag::Newton>::solve(
// TODO be more efficient
// init _minus_delta_x to the right size and 0.0
LinAlg
::
copy
(
x
,
minus_delta_x
);
minus_delta_x
.
setZero
();
_convergence_criterion
->
preFirstIteration
();
...
...
@@ -208,6 +207,8 @@ bool NonlinearSolver<NonlinearSolverTag::Newton>::solve(
sys
.
getJacobian
(
J
);
INFO
(
"[time] Assembly took %g s."
,
time_assembly
.
elapsed
());
minus_delta_x
.
setZero
();
BaseLib
::
RunTime
time_dirichlet
;
time_dirichlet
.
start
();
sys
.
applyKnownSolutionsNewton
(
J
,
res
,
minus_delta_x
);
...
...
This diff is collapsed.
Click to expand it.
Data
@
e8530251
Compare
cf0cae27
...
e8530251
Subproject commit
cf0cae279bc383ee612c368972e8fa9e1c72722b
Subproject commit
e8530251e2bfeed88f34528ee49db55d6ceb68ee
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment