Commit 8c181420 authored by Christophe Geuzaine's avatar Christophe Geuzaine

optimiser finalize

parent 909f8427
Pipeline #1115 passed with stage
in 45 seconds
......@@ -1164,8 +1164,6 @@ struct Operation {
struct {
char *residual;
} OptimizerUpdate;
struct {
} OptimizerFinalize;
} Case;
};
......@@ -1318,6 +1316,7 @@ struct IterativeLoopSystem {
#define OPERATION_DEBUG 106
#define OPERATION_OPTIMIZER_INITIALIZE 107
#define OPERATION_OPTIMIZER_UPDATE 108
#define OPERATION_OPTIMIZER_FINALIZE 109
/* ChangeOfState.Type */
#define CHANGEOFSTATE_NOCHANGE 0
......
This diff is collapsed.
This diff is collapsed.
......@@ -308,7 +308,7 @@ struct doubleXstring{
%token tFourierTransform tFourierTransformJ
%token tCopySolution tCopyRHS tCopyResidual tCopyIncrement tCopyDofs
%token tGetNormSolution tGetNormResidual tGetNormRHS tGetNormIncrement
%token tOptimizerInitialize tOptimizerUpdate tOptimizerFinalize
%token tOptimizerInitialize tOptimizerUpdate tOptimizerFinalize
%token tLanczos tEigenSolve tEigenSolveJac tPerturbation
%token tUpdate tUpdateConstraint tBreak tGetResidual tCreateSolution
%token tEvaluate tSelectCorrection tAddCorrection tMultiplySolution
......@@ -5834,7 +5834,7 @@ OperationTerm :
}
| tOptimizerInitialize '[' CharExpr ',' CharExpr ','
ListOfFExpr ',' ListOfFExpr ','
ListOfFExpr ',' ListOfFExpr ','
CharExpr ',' BracedRecursiveListOfCharExpr ','
CharExpr ',' BracedRecursiveListOfCharExpr ']' tEND
{
......@@ -5863,6 +5863,7 @@ OperationTerm :
{
Operation_P = (struct Operation*)
List_Pointer(Operation_L, List_Nbr(Operation_L)-1) ;
Operation_P->Type = OPERATION_OPTIMIZER_FINALIZE;
}
| Loop
......
......@@ -3297,6 +3297,10 @@ void Treatment_Operation(struct Resolution * Resolution_P,
Operation_OptimizerUpdate(Operation_P);
break ;
case OPERATION_OPTIMIZER_FINALIZE :
Operation_OptimizerFinalize(Operation_P);
break ;
/* --> O t h e r */
/* ------------------------------------------ */
......
......@@ -105,6 +105,8 @@ void Operation_OptimizerInitialize(struct Operation *Operation_P);
void Operation_OptimizerUpdate(struct Operation *Operation_P);
void Operation_OptimizerFinalize(struct Operation *Operation_P);
void Cal_SolutionError(gVector *dx, gVector *x, int diff, double *MeanError);
void Free_UnusedSolutions(struct DofData * DofData_P);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment