Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 4045) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 4046) @@ -202,5 +202,5 @@ PressureOldEnum, QmuPressureEnum, - StokesPressureEnum, + PressureStokesEnum, ResetPenaltiesEnum, RheologyBEnum, Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 4045) +++ /issm/trunk/src/c/Makefile.am (revision 4046) @@ -371,4 +371,24 @@ ./modules/MaxVelx/MaxVelx.h\ ./modules/MaxVelx/MaxVelx.cpp\ + ./modules/MaxAbsVxx/MaxAbsVxx.h\ + ./modules/MaxAbsVxx/MaxAbsVxx.cpp\ + ./modules/MaxAbsVyx/MaxAbsVyx.h\ + ./modules/MaxAbsVyx/MaxAbsVyx.cpp\ + ./modules/MaxAbsVzx/MaxAbsVzx.h\ + ./modules/MaxAbsVzx/MaxAbsVzx.cpp\ + ./modules/MaxVxx/MaxVxx.h\ + ./modules/MaxVxx/MaxVxx.cpp\ + ./modules/MaxVyx/MaxVyx.h\ + ./modules/MaxVyx/MaxVyx.cpp\ + ./modules/MaxVzx/MaxVzx.h\ + ./modules/MaxVzx/MaxVzx.cpp\ + ./modules/MinVxx/MinVxx.h\ + ./modules/MinVxx/MinVxx.cpp\ + ./modules/MinVyx/MinVyx.h\ + ./modules/MinVyx/MinVyx.cpp\ + ./modules/MinVzx/MinVzx.h\ + ./modules/MinVzx/MinVzx.cpp\ + ./modules/DuplicateInputx/DuplicateInputx.h\ + ./modules/DuplicateInputx/DuplicateInputx.cpp\ ./modules/ControlConstrainx/ControlConstrainx.h\ ./modules/ControlConstrainx/ControlConstrainx.cpp\ @@ -847,4 +867,24 @@ ./modules/MaxVelx/MaxVelx.h\ ./modules/MaxVelx/MaxVelx.cpp\ + ./modules/MaxAbsVxx/MaxAbsVxx.h\ + ./modules/MaxAbsVxx/MaxAbsVxx.cpp\ + ./modules/MaxAbsVyx/MaxAbsVyx.h\ + ./modules/MaxAbsVyx/MaxAbsVyx.cpp\ + ./modules/MaxAbsVzx/MaxAbsVzx.h\ + ./modules/MaxAbsVzx/MaxAbsVzx.cpp\ + ./modules/MaxVxx/MaxVxx.h\ + ./modules/MaxVxx/MaxVxx.cpp\ + ./modules/MaxVyx/MaxVyx.h\ + ./modules/MaxVyx/MaxVyx.cpp\ + ./modules/MaxVzx/MaxVzx.h\ + ./modules/MaxVzx/MaxVzx.cpp\ + ./modules/MinVxx/MinVxx.h\ + ./modules/MinVxx/MinVxx.cpp\ + ./modules/MinVyx/MinVyx.h\ + ./modules/MinVyx/MinVyx.cpp\ + ./modules/MinVzx/MinVzx.h\ + ./modules/MinVzx/MinVzx.cpp\ + ./modules/DuplicateInputx/DuplicateInputx.h\ + ./modules/DuplicateInputx/DuplicateInputx.cpp\ ./modules/ControlConstrainx/ControlConstrainx.h\ ./modules/ControlConstrainx/ControlConstrainx.cpp\ Index: /issm/trunk/src/c/modules/DuplicateInputx/DuplicateInputx.cpp =================================================================== --- /issm/trunk/src/c/modules/DuplicateInputx/DuplicateInputx.cpp (revision 4045) +++ /issm/trunk/src/c/modules/DuplicateInputx/DuplicateInputx.cpp (revision 4046) @@ -1,7 +1,7 @@ -/*!\file ReinitializeInputx - * \brief: reinitialize an input inside the elements, so that QMU runs can be carried out. +/*!\file DuplicateInputx + * \brief: duplicte an input inside the elements, onto another, and wipe it off. */ -#include "./ReinitializeInputx.h" +#include "./DuplicateInputx.h" #include "../../shared/shared.h" #include "../../include/include.h" @@ -9,5 +9,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" -void ReinitializeInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int reinitialized_enum, int original_enum){ +void DuplicateInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int reinitialized_enum, int original_enum){ /*intermediary:*/ @@ -20,5 +20,5 @@ for(i=0;iSize();i++){ Element* element=(Element*)elements->GetObjectByOffset(i); - element->ReinitializeInput(reinitialized_enum,original_enum); + element->DuplicateInput(reinitialized_enum,original_enum); } Index: /issm/trunk/src/c/modules/DuplicateInputx/DuplicateInputx.h =================================================================== --- /issm/trunk/src/c/modules/DuplicateInputx/DuplicateInputx.h (revision 4045) +++ /issm/trunk/src/c/modules/DuplicateInputx/DuplicateInputx.h (revision 4046) @@ -1,14 +1,14 @@ -/*!\file: ReinitializeInputx.h +/*!\file: DuplicateInputx.h * \brief header file for field extrusion */ -#ifndef _REINITIALIZEINPUTX_H -#define _REINITIALIZEINPUTX_H +#ifndef _DUPLICATEINPUTX_H +#define _DUPLICATEINPUTX_H #include "../../DataSet/DataSet.h" /* local prototypes: */ -void ReinitializeInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int reinitialized_enum, int original_enum); +void DuplicateInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int reinitialized_enum, int original_enum); -#endif /* _REINITIALIZEINPUTX_H */ +#endif /* _DUPLICATEINPUTX_H */ Index: /issm/trunk/src/c/modules/modules.h =================================================================== --- /issm/trunk/src/c/modules/modules.h (revision 4045) +++ /issm/trunk/src/c/modules/modules.h (revision 4046) @@ -78,5 +78,5 @@ #include "./MaxVzx/MaxVzx.h" #include "./MaxAbsVzx/MaxAbsVzx.h" -#include "./ReinitializeInputx/ReinitializeInputx.h" +#include "./DuplicateInputx/DuplicateInputx.h" #endif Index: /issm/trunk/src/c/objects/Elements/Beam.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Beam.cpp (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Beam.cpp (revision 4046) @@ -973,6 +973,6 @@ } /*}}}*/ -/*FUNCTION Beam::ReinitializeInput(int reinitialized_enum,int original_enum){{{1*/ -void Beam::ReinitializeInput(int reinitialized_enum,int original_enum){ +/*FUNCTION Beam::DuplicateInput(int original_enum,int new_enum){{{1*/ +void Beam::DuplicateInput(int original_enum,int new_enum){ Input* original=NULL; @@ -984,5 +984,5 @@ /*Change copy enum to reinitialized_enum: */ - copy->ChangeEnum(reinitialized_enum); + copy->ChangeEnum(new_enum); /*Add copy into inputs, it will wipe off the one already there: */ Index: /issm/trunk/src/c/objects/Elements/Beam.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Beam.h (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Beam.h (revision 4046) @@ -94,5 +94,5 @@ void MaxVz(double* pmaxvz, bool process_units); void MaxAbsVz(double* pmaxabsvz, bool process_units); - void ReinitializeInput(int reinitialized_enum,int original_enum); + void DuplicateInput(int original_enum,int new_enum); /*}}}*/ Index: /issm/trunk/src/c/objects/Elements/Element.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Element.h (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Element.h (revision 4046) @@ -64,5 +64,5 @@ virtual void MaxVz(double* pmaxvz, bool process_units)=0; virtual void MaxAbsVz(double* pmaxabsvz, bool process_units)=0; - virtual void ReinitializeInput(int reinitialized_enum,int original_enum)=0; + virtual void DuplicateInput(int original_enum,int new_enum)=0; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4046) @@ -5311,6 +5311,6 @@ } /*}}}*/ -/*FUNCTION Penta::ReinitializeInput(int reinitialized_enum,int original_enum){{{1*/ -void Penta::ReinitializeInput(int reinitialized_enum,int original_enum){ +/*FUNCTION Penta::DuplicateInput(int original_enum,int new_enum){{{1*/ +void Penta::DuplicateInput(int original_enum,int new_enum){ Input* original=NULL; @@ -5322,5 +5322,5 @@ /*Change copy enum to reinitialized_enum: */ - copy->ChangeEnum(reinitialized_enum); + copy->ChangeEnum(new_enum); /*Add copy into inputs, it will wipe off the one already there: */ Index: /issm/trunk/src/c/objects/Elements/Penta.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.h (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Penta.h (revision 4046) @@ -161,5 +161,5 @@ void MaxVz(double* pmaxvz, bool process_units); void MaxAbsVz(double* pmaxabsvz, bool process_units); - void ReinitializeInput(int reinitialized_enum,int original_enum); + void DuplicateInput(int original_enum,int new_enum); Index: /issm/trunk/src/c/objects/Elements/Sing.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Sing.cpp (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Sing.cpp (revision 4046) @@ -679,6 +679,6 @@ } /*}}}*/ -/*FUNCTION Sing::ReinitializeInput(int reinitialized_enum,int original_enum){{{1*/ -void Sing::ReinitializeInput(int reinitialized_enum,int original_enum){ +/*FUNCTION Sing::DuplicateInput(int original_enum,int new_enum){{{1*/ +void Sing::DuplicateInput(int original_enum,int new_enum){ Input* original=NULL; @@ -690,5 +690,5 @@ /*Change copy enum to reinitialized_enum: */ - copy->ChangeEnum(reinitialized_enum); + copy->ChangeEnum(new_enum); /*Add copy into inputs, it will wipe off the one already there: */ Index: /issm/trunk/src/c/objects/Elements/Sing.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Sing.h (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Sing.h (revision 4046) @@ -93,5 +93,5 @@ void MaxVz(double* pmaxvz, bool process_units); void MaxAbsVz(double* pmaxabsvz, bool process_units); - void ReinitializeInput(int reinitialized_enum,int original_enum); + void DuplicateInput(int original_enum,int new_enum); Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4046) @@ -5420,6 +5420,6 @@ } /*}}}*/ -/*FUNCTION Tria::ReinitializeInput(int reinitialized_enum,int original_enum){{{1*/ -void Tria::ReinitializeInput(int reinitialized_enum,int original_enum){ +/*FUNCTION Tria::DuplicateInput(int original_enum,int new_enum){{{1*/ +void Tria::DuplicateInput(int original_enum,int new_enum){ Input* original=NULL; @@ -5431,5 +5431,5 @@ /*Change copy enum to reinitialized_enum: */ - copy->ChangeEnum(reinitialized_enum); + copy->ChangeEnum(new_enum); /*Add copy into inputs, it will wipe off the one already there: */ Index: /issm/trunk/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.h (revision 4045) +++ /issm/trunk/src/c/objects/Elements/Tria.h (revision 4046) @@ -139,5 +139,5 @@ void MaxVz(double* pmaxvz, bool process_units); void MaxAbsVz(double* pmaxabsvz, bool process_units); - void ReinitializeInput(int reinitialized_enum,int original_enum); + void DuplicateInput(int original_enum,int new_enum); Index: /issm/trunk/src/c/solutions/diagnostic_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/diagnostic_core.cpp (revision 4045) +++ /issm/trunk/src/c/solutions/diagnostic_core.cpp (revision 4046) @@ -34,8 +34,8 @@ /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/ if(qmu_analysis){ - ReinitializeInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,QmuVxEnum); - ReinitializeInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,QmuVyEnum); - ReinitializeInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum,QmuVzEnum); - ReinitializeInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,QmuPressureEnum); + DuplicateInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVxEnum,VxEnum); + DuplicateInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVyEnum,VyEnum); + DuplicateInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVzEnum,VzEnum); + DuplicateInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuPressureEnum,PressureEnum); } @@ -67,5 +67,5 @@ //"recondition" pressure computed previously: - DuplicateInputx(femmodel,PressureEnum,PressureStokesEnum); + DuplicateInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressureStokesEnum); ScaleInputx(femmmodel,PressureStokesEnum,1.0/stokesreconditioning);