Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Kirill Terekhov
INMOST
Commits
e322db6e
Commit
e322db6e
authored
Mar 02, 2016
by
Kirill Terekhov
Browse files
Synchronize
modified DMP correction in ADMFD
parent
7892a56d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Examples/ADMFD/main.cpp
View file @
e322db6e
...
...
@@ -456,10 +456,12 @@ int main(int argc,char ** argv)
vMatrix
vnKGRAD
=
nKGRAD
;
vMatrix
card
(
NF
,
1
);
vMatrix
dpF
(
NF
,
1
);
variable
div
=
0
;
//denominators of corrections
//this is sum of absolute values of differences
for
(
int
k
=
0
;
k
<
NF
;
++
k
)
{
div
+=
FLUX
(
k
,
0
)
*
faces
[
k
].
Area
();;
for
(
int
j
=
0
;
j
<
NF
;
++
j
)
{
dpF
(
k
,
0
)
+=
soft_fabs
(
pF
(
j
,
0
)
-
pF
(
k
,
0
),
1.0e-9
);
...
...
@@ -473,7 +475,9 @@ int main(int argc,char ** argv)
for
(
int
j
=
k
+
1
;
j
<
NF
;
++
j
)
//if( nKGRAD(k,j) > 0.0 )
{
//beta = soft_fabs(FLUX(k,0),1.0e-9)/(dpF(k,0)) + soft_fabs(FLUX(j,0),1.0e-9)/(dpF(j,0));
beta
=
soft_max
(
soft_fabs
(
FLUX
(
k
,
0
),
1.0e-9
)
/
card
(
k
,
0
),
soft_fabs
(
FLUX
(
j
,
0
),
1.0e-9
)
/
card
(
j
,
0
),
1.0e-9
)
/
soft_fabs
(
pF
(
k
,
0
)
-
pF
(
j
,
0
),
1.0e-9
);
beta
=
soft_max
(
soft_fabs
(
FLUX
(
k
,
0
)
-
FLUX
(
j
,
0
),
1.0e-9
)
/
card
(
k
,
0
),
soft_fabs
(
FLUX
(
j
,
0
)
-
FLUX
(
k
,
0
),
1.0e-9
)
/
card
(
j
,
0
),
1.0e-9
)
/
soft_fabs
(
pF
(
k
,
0
)
-
pF
(
j
,
0
),
1.0e-9
);
//beta = soft_max(soft_fabs(FLUX(k,0),1.0e-9)/card(k,0),soft_fabs(FLUX(j,0),1.0e-9)/card(j,0),1.0e-9)/soft_fabs(pF(k,0)-pF(j,0),1.0e-9);
//beta = soft_max(soft_fabs(div,1.0e-9)/card(k,0),soft_fabs(div,1.0e-9)/card(j,0),1.0e-9)/soft_fabs(pF(k,0)-pF(j,0),1.0e-9);
beta
=
variation
(
beta
,
var
);
vnKGRAD
(
k
,
j
)
-=
(
beta
);
vnKGRAD
(
j
,
k
)
-=
(
beta
);
...
...
Source/Solver/solver.cpp
View file @
e322db6e
...
...
@@ -46,8 +46,8 @@
//#define USE_OMP
//
#define KSOLVER BCGSL_solver
#define KSOLVER BCGS_solver
#define KSOLVER BCGSL_solver
//
#define KSOLVER BCGS_solver
//#define ACCELERATED_CONDEST
//#define PRINT_CONDEST
...
...
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