Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
IFOS2D
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
GPIAG-Software
IFOS2D
Commits
1aacdfbb
Commit
1aacdfbb
authored
May 12, 2016
by
Florian Wittkamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix: Workflow && CG abort criterium
parent
c1297e4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
src/IFOS2D.c
src/IFOS2D.c
+6
-6
No files found.
src/IFOS2D.c
View file @
1aacdfbb
...
...
@@ -3962,7 +3962,7 @@ int main(int argc, char **argv){
/* ------------------------------------------- */
/* Check when Workflow is used */
/* ------------------------------------------- */
if
(
USE_WORKFLOW
&&
(
diff
<=
pro
||
wolfe_SLS_failed
)){
if
(
USE_WORKFLOW
&&
(
diff
<=
pro
||
wolfe_SLS_failed
||
step3
==
1
)){
if
(
workflow_lines
==
WORKFLOW_STAGE
){
fprintf
(
FP
,
"
\n
Reached the abort criterion of pro = %4.2f: diff = %4.2f
\n
"
,
pro
,
diff
);
...
...
@@ -3995,7 +3995,7 @@ int main(int argc, char **argv){
wolfe_SLS_failed
=
0
;
step3
=
0
;
step3
=
0
;
JOINT_EQUAL_new_max
=
1
;
}
...
...
@@ -4033,8 +4033,8 @@ int main(int argc, char **argv){
wolfe_SLS_failed
=
0
;
alpha_SL_old
=
1
;
step3
=
0
;
JOINT_EQUAL_new_max
=
1
;
step3
=
0
;
JOINT_EQUAL_new_max
=
1
;
}
/* ------------------------------------------------- */
...
...
@@ -4071,8 +4071,8 @@ int main(int argc, char **argv){
wolfe_SLS_failed
=
0
;
alpha_SL_old
=
1
;
step3
=
0
;
JOINT_EQUAL_new_max
=
1
;
step3
=
0
;
JOINT_EQUAL_new_max
=
1
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment