Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 9292) +++ /issm/trunk/src/c/Makefile.am (revision 9293) @@ -566,6 +566,6 @@ ./modules/Orthx/Orthx.h\ ./modules/Orthx/Orthx.cpp\ - ./modules/UpdateSpcsx/UpdateSpcsx.h\ - ./modules/UpdateSpcsx/UpdateSpcsx.cpp\ + ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h\ + ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp\ ./modules/Gradjx/Gradjx.h\ ./modules/Gradjx/Gradjx.cpp\ @@ -1255,6 +1255,6 @@ ./modules/Orthx/Orthx.h\ ./modules/Orthx/Orthx.cpp\ - ./modules/UpdateSpcsx/UpdateSpcsx.h\ - ./modules/UpdateSpcsx/UpdateSpcsx.cpp\ + ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h\ + ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp\ ./modules/Gradjx/Gradjx.h\ ./modules/Gradjx/Gradjx.cpp\ Index: /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp =================================================================== --- /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 9293) +++ /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 9293) @@ -0,0 +1,42 @@ +/*!\file UpdateDynamicConstraintsx + * \brief module to update single point constraints out of new spc vector, for next time step. + */ + +#include "./UpdateDynamicConstraintsx.h" + +#include "../../shared/shared.h" +#include "../../include/include.h" +#include "../../toolkits/toolkits.h" +#include "../../EnumDefinitions/EnumDefinitions.h" + +void UpdateDynamicConstraintsx(Nodes* nodes,Parameters* parameters,Vec ys){ + + int i; + int configuration_type; + double* ys_serial=NULL; + + /*retrieve parameters: */ + parameters->FindParam(&configuration_type,ConfigurationTypeEnum); + + if(nodes->NumberOfNodes(configuration_type)){ + + /*serialize ys, so nodes can index into it: */ + VecToMPISerial(&ys_serial,ys); + + /*Go through all nodes, and ask them to retrieve values from ys and then update their spc values :*/ + for(i=0;iSize();i++){ + + Node* node=(Node*)nodes->GetObjectByOffset(i); + + /*Check that this node corresponds to our analysis currently being carried out: */ + if (node->InAnalysis(configuration_type)){ + + /*For this object, reset values of spc fields in the node: */ + node->UpdateSpcs(ys_serial); + } + } + } + + /*Free ressources:*/ + xfree((void**)&ys_serial); +} Index: /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h =================================================================== --- /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h (revision 9293) +++ /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h (revision 9293) @@ -0,0 +1,13 @@ +/*!\file: UpdateDynamicConstraintsx.h + * \brief header file for updating single point constraints for next time step + */ + +#ifndef _UPDATEDYNAMICCONSTRAINTSXX_H +#define _UPDATEDYNAMICCONSTRAINTSXX_H + +#include "../../Container/Container.h" +#include "../../objects/objects.h" + +void UpdateDynamicConstraintsx(Nodes* nodes,Parameters* parameters,Vec ys); + +#endif /* _UPDATESPCSX_H */ Index: sm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateSpcsx.cpp =================================================================== --- /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateSpcsx.cpp (revision 9292) +++ (revision ) @@ -1,42 +1,0 @@ -/*!\file UpdateSpcsx - * \brief module to update single point constraints out of new spc vector, for next time step. - */ - -#include "./UpdateSpcsx.h" - -#include "../../shared/shared.h" -#include "../../include/include.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" - -void UpdateSpcsx(Nodes* nodes,Parameters* parameters,Vec ys){ - - int i; - int configuration_type; - double* ys_serial=NULL; - - /*retrieve parameters: */ - parameters->FindParam(&configuration_type,ConfigurationTypeEnum); - - if(nodes->NumberOfNodes(configuration_type)){ - - /*serialize ys, so nodes can index into it: */ - VecToMPISerial(&ys_serial,ys); - - /*Go through all nodes, and ask them to retrieve values from ys and then update their spc values :*/ - for(i=0;iSize();i++){ - - Node* node=(Node*)nodes->GetObjectByOffset(i); - - /*Check that this node corresponds to our analysis currently being carried out: */ - if (node->InAnalysis(configuration_type)){ - - /*For this object, reset values of spc fields in the node: */ - node->UpdateSpcs(ys_serial); - } - } - } - - /*Free ressources:*/ - xfree((void**)&ys_serial); -} Index: sm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateSpcsx.h =================================================================== --- /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateSpcsx.h (revision 9292) +++ (revision ) @@ -1,13 +1,0 @@ -/*!\file: UpdateSpcsx.h - * \brief header file for updating single point constraints for next time step - */ - -#ifndef _UPDATESPCSX_H -#define _UPDATESPCSX_H - -#include "../../Container/Container.h" -#include "../../objects/objects.h" - -void UpdateSpcsx(Nodes* nodes,Parameters* parameters,Vec ys); - -#endif /* _UPDATESPCSX_H */ Index: /issm/trunk/src/c/modules/modules.h =================================================================== --- /issm/trunk/src/c/modules/modules.h (revision 9292) +++ /issm/trunk/src/c/modules/modules.h (revision 9293) @@ -101,5 +101,4 @@ #include "./Solverx/Solverx.h" #include "./SpcNodesx/SpcNodesx.h" -#include "./UpdateConstraintsx/UpdateConstraintsx.h" #include "./SurfaceAreax/SurfaceAreax.h" #include "./SystemMatricesx/SystemMatricesx.h" @@ -109,5 +108,6 @@ #include "./ThicknessAbsGradientx/ThicknessAbsGradientx.h" #include "./UpdateVertexPositionsx/UpdateVertexPositionsx.h" -#include "./UpdateSpcsx/UpdateSpcsx.h" +#include "./UpdateConstraintsx/UpdateConstraintsx.h" +#include "./UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h" #include "./VerticesDofx/VerticesDofx.h" #include "./VecMergex/VecMergex.h" Index: /issm/trunk/src/c/solutions/ResetBoundaryConditions.cpp =================================================================== --- /issm/trunk/src/c/solutions/ResetBoundaryConditions.cpp (revision 9292) +++ /issm/trunk/src/c/solutions/ResetBoundaryConditions.cpp (revision 9293) @@ -28,5 +28,5 @@ /*update spcs using this new vector of constraints: */ - UpdateSpcsx(femmodel->nodes,femmodel->parameters,ys); + UpdateDynamicConstraintsx(femmodel->nodes,femmodel->parameters,ys); /*Free ressources:*/ Index: /issm/trunk/src/m/enum/Fake34Enum.m =================================================================== --- /issm/trunk/src/m/enum/Fake34Enum.m (revision 9293) +++ /issm/trunk/src/m/enum/Fake34Enum.m (revision 9293) @@ -0,0 +1,11 @@ +function macro=Fake34Enum() +%FAKE34ENUM - Enum of Fake34 +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=Fake34Enum() + +macro=StringToEnum('Fake34'); Index: /issm/trunk/src/m/solutions/ResetBoundaryConditions.m =================================================================== --- /issm/trunk/src/m/solutions/ResetBoundaryConditions.m (revision 9292) +++ /issm/trunk/src/m/solutions/ResetBoundaryConditions.m (revision 9293) @@ -17,3 +17,3 @@ %update values of spcs inside nodes - femmodel.nodes=UpdateSpcs(femmodel.nodes,femmodel.parameters,ys); + femmodel.nodes=UpdateDynamicConstraints(femmodel.nodes,femmodel.parameters,ys); Index: /issm/trunk/src/mex/Makefile.am =================================================================== --- /issm/trunk/src/mex/Makefile.am (revision 9292) +++ /issm/trunk/src/mex/Makefile.am (revision 9293) @@ -85,5 +85,5 @@ InputUpdateFromVector\ UpdateVertexPositions\ - UpdateSpcs\ + UpdateDynamicConstraints\ VerticesDof @@ -348,12 +348,10 @@ UpdateVertexPositions/UpdateVertexPositions.h -UpdateSpcs_SOURCES = UpdateSpcs/UpdateSpcs.cpp\ - UpdateSpcs/UpdateSpcs.h +UpdateDynamicConstraints_SOURCES = UpdateDynamicConstraints/UpdateDynamicConstraints.cpp\ + UpdateDynamicConstraints/UpdateDynamicConstraints.h ParsePetscOptions_SOURCES = ParsePetscOptions/ParsePetscOptions.cpp\ ParsePetscOptions/ParsePetscOptions.h - VerticesDof_SOURCES = VerticesDof/VerticesDof.cpp\ VerticesDof/VerticesDof.h - Index: /issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp =================================================================== --- /issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp (revision 9293) +++ /issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp (revision 9293) @@ -0,0 +1,44 @@ +/*\file UpdateDynamicConstraints.c + *\brief: update single point constraints inside nodes out of constrain vector ys + */ + +#include "./UpdateDynamicConstraints.h" + +void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){ + + /*input datasets: */ + Nodes* nodes=NULL; + Parameters* parameters=NULL; + Vec ys=NULL; + + /*Boot module: */ + MODULEBOOT(); + + /*checks on arguments on the matlab side: */ + CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&UpdateDynamicConstraintsUsage); + + /*Input datasets: */ + FetchMatlabData((DataSet**)&nodes,NODESIN); + FetchMatlabData((Parameters**)¶meters,PARAMETERS); + FetchMatlabData(&ys,YS); + + /*!Generate internal degree of freedom numbers: */ + UpdateDynamicConstraintsx(nodes,parameters,ys); + + /*write output datasets: */ + WriteMatlabData(NODESOUT,nodes); + + /*Free ressources: */ + delete nodes; + delete parameters; + + /*end module: */ + MODULEEND(); +} + +void UpdateDynamicConstraintsUsage(void) +{ + _printf_(true,"\n"); + _printf_(true," usage: m.nodes=%s(m.nodes,m.parameters,ys);\n",__FUNCT__); + _printf_(true,"\n"); +} Index: /issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h =================================================================== --- /issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h (revision 9293) +++ /issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h (revision 9293) @@ -0,0 +1,32 @@ +/* + UpdateDynamicConstraints.h +*/ + +#ifndef _UPDATESPCS_H +#define _UPDATESPCS_H + +/* local prototypes: */ +void UpdateDynamicConstraintsUsage(void); + +#include "../../c/modules/modules.h" +#include "../../c/Container/Container.h" +#include "../../c/shared/shared.h" + +#undef __FUNCT__ +#define __FUNCT__ "UpdateDynamicConstraints" + +/* serial input macros: */ +#define NODESIN (mxArray*)prhs[0] +#define PARAMETERS (mxArray*)prhs[1] +#define YS (mxArray*)prhs[2] + +/* serial output macros: */ +#define NODESOUT (mxArray**)&plhs[0] + +/* serial arg counts: */ +#undef NLHS +#define NLHS 1 +#undef NRHS +#define NRHS 3 + +#endif /* _UPDATESPCS_H */