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
Dmitri Naumov
ogs
Commits
580454c4
Commit
580454c4
authored
7 years ago
by
Dmitri Naumov
Browse files
Options
Downloads
Patches
Plain Diff
[PL] Remove NLTag template from createProcessData.
parent
839ec223
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
ProcessLib/CreateProcessData.cpp
+2
-2
2 additions, 2 deletions
ProcessLib/CreateProcessData.cpp
ProcessLib/ProcessData.h
+4
-4
4 additions, 4 deletions
ProcessLib/ProcessData.h
with
6 additions
and
6 deletions
ProcessLib/CreateProcessData.cpp
+
2
−
2
View file @
580454c4
...
@@ -35,7 +35,7 @@ static std::unique_ptr<ProcessData> makeProcessData(
...
@@ -35,7 +35,7 @@ static std::unique_ptr<ProcessData> makeProcessData(
nonlinear_solver_picard
->
compensateNonEquilibriumInitialResiduum
(
nonlinear_solver_picard
->
compensateNonEquilibriumInitialResiduum
(
compensate_non_equilibrium_initial_residuum
);
compensate_non_equilibrium_initial_residuum
);
return
std
::
make_unique
<
ProcessData
>
(
return
std
::
make_unique
<
ProcessData
>
(
std
::
move
(
timestepper
),
*
nonlinear_solver_picard
,
std
::
move
(
timestepper
),
Tag
::
Picard
,
*
nonlinear_solver_picard
,
std
::
move
(
conv_crit
),
std
::
move
(
time_disc
),
process_id
,
process
);
std
::
move
(
conv_crit
),
std
::
move
(
time_disc
),
process_id
,
process
);
}
}
if
(
auto
*
nonlinear_solver_newton
=
if
(
auto
*
nonlinear_solver_newton
=
...
@@ -45,7 +45,7 @@ static std::unique_ptr<ProcessData> makeProcessData(
...
@@ -45,7 +45,7 @@ static std::unique_ptr<ProcessData> makeProcessData(
nonlinear_solver_newton
->
compensateNonEquilibriumInitialResiduum
(
nonlinear_solver_newton
->
compensateNonEquilibriumInitialResiduum
(
compensate_non_equilibrium_initial_residuum
);
compensate_non_equilibrium_initial_residuum
);
return
std
::
make_unique
<
ProcessData
>
(
return
std
::
make_unique
<
ProcessData
>
(
std
::
move
(
timestepper
),
*
nonlinear_solver_newton
,
std
::
move
(
timestepper
),
Tag
::
Newton
,
*
nonlinear_solver_newton
,
std
::
move
(
conv_crit
),
std
::
move
(
time_disc
),
process_id
,
process
);
std
::
move
(
conv_crit
),
std
::
move
(
time_disc
),
process_id
,
process
);
}
}
...
...
This diff is collapsed.
Click to expand it.
ProcessLib/ProcessData.h
+
4
−
4
View file @
580454c4
...
@@ -22,16 +22,16 @@ namespace ProcessLib
...
@@ -22,16 +22,16 @@ namespace ProcessLib
{
{
struct
ProcessData
struct
ProcessData
{
{
template
<
NumLib
::
NonlinearSolverTag
NLTag
>
ProcessData
(
std
::
unique_ptr
<
NumLib
::
TimeStepAlgorithm
>&&
timestepper_
,
ProcessData
(
std
::
unique_ptr
<
NumLib
::
TimeStepAlgorithm
>&&
timestepper_
,
NumLib
::
NonlinearSolver
<
NLTag
>&
nonlinear_solver
,
NumLib
::
NonlinearSolverTag
const
nonlinear_solver_tag_
,
NumLib
::
NonlinearSolverBase
&
nonlinear_solver_
,
std
::
unique_ptr
<
NumLib
::
ConvergenceCriterion
>&&
conv_crit_
,
std
::
unique_ptr
<
NumLib
::
ConvergenceCriterion
>&&
conv_crit_
,
std
::
unique_ptr
<
NumLib
::
TimeDiscretization
>&&
time_disc_
,
std
::
unique_ptr
<
NumLib
::
TimeDiscretization
>&&
time_disc_
,
int
const
process_id_
,
int
const
process_id_
,
Process
&
process_
)
Process
&
process_
)
:
timestepper
(
std
::
move
(
timestepper_
)),
:
timestepper
(
std
::
move
(
timestepper_
)),
nonlinear_solver_tag
(
NLT
ag
),
nonlinear_solver_tag
(
nonlinear_solver_t
ag
_
),
nonlinear_solver
(
nonlinear_solver
),
nonlinear_solver
(
nonlinear_solver
_
),
nonlinear_solver_status
{
true
,
0
},
nonlinear_solver_status
{
true
,
0
},
conv_crit
(
std
::
move
(
conv_crit_
)),
conv_crit
(
std
::
move
(
conv_crit_
)),
time_disc
(
std
::
move
(
time_disc_
)),
time_disc
(
std
::
move
(
time_disc_
)),
...
...
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