Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ddm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
gmsh
ddm
Commits
065b9679
Commit
065b9679
authored
2 years ago
by
Anthony Royer
Browse files
Options
Downloads
Plain Diff
Merge branch 'cleanup_refactor' into 'master'
Minor cleanup See merge request
!27
parents
c75f266b
ab86456a
No related branches found
No related tags found
1 merge request
!27
Minor cleanup
Pipeline
#10240
failed
2 years ago
Stage: gmshfem
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/problem/Formulation.h
+2
-21
2 additions, 21 deletions
src/problem/Formulation.h
src/problem/Solvers.cpp
+0
-2
0 additions, 2 deletions
src/problem/Solvers.cpp
with
2 additions
and
23 deletions
src/problem/Formulation.h
+
2
−
21
View file @
065b9679
...
@@ -95,7 +95,7 @@ namespace gmshddm
...
@@ -95,7 +95,7 @@ namespace gmshddm
friend
int
MatVectProduct
<
T_Scalar
>
(
Mat
A
,
Vec
X
,
Vec
Y
);
friend
int
MatVectProduct
<
T_Scalar
>
(
Mat
A
,
Vec
X
,
Vec
Y
);
friend
int
MatVectProductOverride
<
T_Scalar
>
(
Mat
A
,
Vec
X
,
Vec
Y
,
bool
IA
);
friend
int
MatVectProductOverride
<
T_Scalar
>
(
Mat
A
,
Vec
X
,
Vec
Y
,
bool
IA
);
//*
// T_Scalar, PetscScalar, T_Interger
// T_Scalar, PetscScalar, T_Interger
template
<
class
T_Scalar1
,
class
T_Scalar2
,
class
T_Integer
>
template
<
class
T_Scalar1
,
class
T_Scalar2
,
class
T_Integer
>
struct
PetscInterface
{
struct
PetscInterface
{
...
@@ -115,26 +115,7 @@ namespace gmshddm
...
@@ -115,26 +115,7 @@ namespace gmshddm
delete
[]
array
;
delete
[]
array
;
}
}
};
};
//*/
/*
template< class T_Scalar1, class T_Integer >
struct PetscInterface< T_Scalar1, T_Scalar1, T_Integer > {
static int kspPrint(KSP ksp, T_Integer it, gmshfem::scalar::Precision< T_Scalar1 > rnorm, void *mctx)
{
Formulation< T_Scalar1 > *formulation = static_cast< Formulation< T_Scalar1 > * >(mctx);
//formulation->_runIterationOperations(it, rnorm);
return 0;
}
static const T_Scalar1 *arrayInterface(const T_Scalar1 *array, const T_Integer size)
{
return array;
}
static void freeArray(const T_Scalar1 *array)
{
}
};*/
};
};
...
...
This diff is collapsed.
Click to expand it.
src/problem/Solvers.cpp
+
0
−
2
View file @
065b9679
...
@@ -53,7 +53,6 @@ namespace gmshddm
...
@@ -53,7 +53,6 @@ namespace gmshddm
{
{
_absoluteResidual
.
push_back
(
rnorm
);
_absoluteResidual
.
push_back
(
rnorm
);
_relativeResidual
.
push_back
(
rnorm
/
_absoluteResidual
[
0
]);
_relativeResidual
.
push_back
(
rnorm
/
_absoluteResidual
[
0
]);
//_numberOfIterations = iteration;
const
unsigned
int
MPI_Rank
=
mpi
::
getMPIRank
();
const
unsigned
int
MPI_Rank
=
mpi
::
getMPIRank
();
if
(
MPI_Rank
==
0
)
{
if
(
MPI_Rank
==
0
)
{
...
@@ -125,7 +124,6 @@ namespace gmshddm
...
@@ -125,7 +124,6 @@ namespace gmshddm
solverMod
.
insert
(
*
it
);
solverMod
.
insert
(
*
it
);
}
}
}
}
gmshfem
::
msg
::
print
<<
"solverBase: "
<<
solverBase
<<
"solverName : "
<<
_solverName
<<
gmshfem
::
msg
::
endl
;
KSP
ksp
;
KSP
ksp
;
PC
pc
;
PC
pc
;
KSPCreate
(
PETSC_COMM_WORLD
,
&
ksp
);
KSPCreate
(
PETSC_COMM_WORLD
,
&
ksp
);
...
...
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