Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.h (revision 12461) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.h (revision 12462) @@ -17,7 +17,7 @@ int sid; /*! id, to track it*/ int nodeid; /*!node id*/ int dof; /*!component*/ - double value; /*value*/ + IssmDouble value; /*value*/ bool isset; int analysis_type; @@ -43,8 +43,8 @@ /*SpcDynamic management:{{{ */ int GetNodeId(); int GetDof(); - double GetValue(); - void SetDynamicConstraint(Nodes* nodes,double *yg_serial); + IssmDouble GetValue(); + void SetDynamicConstraint(Nodes* nodes,IssmDouble *yg_serial); /*}}}*/ }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.h (revision 12461) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.h (revision 12462) @@ -17,14 +17,14 @@ int sid; /*! id, to track it*/ int nodeid; /*!node id*/ int dof; /*!component*/ - double value; /*value*/ + IssmDouble value; /*value*/ int analysis_type; public: /*SpcStatic constructors, destructors:{{{*/ SpcStatic(); - SpcStatic(int sid,int nodeid, int dof,double value,int analysis_type); + SpcStatic(int sid,int nodeid, int dof,IssmDouble value,int analysis_type); ~SpcStatic(); /*}}}*/ /*Object virtual functions definitions:{{{ */ @@ -42,7 +42,7 @@ /*SpcStatic management:{{{ */ int GetNodeId(); int GetDof(); - double GetValue(); + IssmDouble GetValue(); /*}}}*/ }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.h (revision 12461) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.h (revision 12462) @@ -17,8 +17,8 @@ int sid; /*! id, to track it*/ int nodeid; /*!node id*/ int dof; /*!component*/ - double* values; /*different values in time*/ - double* times; /*different time steps*/ + IssmDouble* values; /*different values in time*/ + IssmDouble* times; /*different time steps*/ int nsteps; /*number of time steps*/ int analysis_type; @@ -26,7 +26,7 @@ /*SpcTransient constructors, destructors:{{{*/ SpcTransient(); - SpcTransient(int sid,int nodeid, int dof,int nsteps, double* times, double* values,int analysis_type); + SpcTransient(int sid,int nodeid, int dof,int nsteps, IssmDouble* times, IssmDouble* values,int analysis_type); ~SpcTransient(); /*}}}*/ /*Object virtual functions definitions:{{{ */ @@ -44,7 +44,7 @@ /*SpcTransient management:{{{ */ int GetNodeId(); int GetDof(); - double GetValue(); + IssmDouble GetValue(); /*}}}*/ }; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12461) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12462) @@ -121,14 +121,14 @@ } /*}}}*/ /*FUNCTION SpcDynamic::GetValue {{{*/ -double SpcDynamic::GetValue(){ +IssmDouble SpcDynamic::GetValue(){ _assert_(this->isset); _assert_(!isnan(value)); return value; } /*}}}*/ /*FUNCTION SpcDynamic::SetDynamicConstraint {{{*/ -void SpcDynamic::SetDynamicConstraint(Nodes* nodes,double* yg_serial){ +void SpcDynamic::SetDynamicConstraint(Nodes* nodes,IssmDouble* yg_serial){ int pos; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12461) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12462) @@ -23,7 +23,7 @@ } /*}}}*/ /*FUNCTION SpcStatic::SpcStatic(int spc_sid,int spc_nodeid,...){{{*/ -SpcStatic::SpcStatic(int spc_sid,int spc_nodeid, int spc_dof,double spc_value,int spc_analysis_type){ +SpcStatic::SpcStatic(int spc_sid,int spc_nodeid, int spc_dof,IssmDouble spc_value,int spc_analysis_type){ sid=spc_sid; nodeid=spc_nodeid; @@ -122,7 +122,7 @@ } /*}}}*/ /*FUNCTION SpcStatic::GetValue {{{*/ -double SpcStatic::GetValue(){ +IssmDouble SpcStatic::GetValue(){ _assert_(!isnan(value)); return value; } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12461) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12462) @@ -30,17 +30,17 @@ } /*}}}*/ /*FUNCTION SpcTransient::SpcTransient(int spc_sid,int spc_nodeid,...){{{*/ -SpcTransient::SpcTransient(int spc_sid,int spc_nodeid, int spc_dof,int spc_nsteps, double* spc_times, double* spc_values,int spc_analysis_type){ +SpcTransient::SpcTransient(int spc_sid,int spc_nodeid, int spc_dof,int spc_nsteps, IssmDouble* spc_times, IssmDouble* spc_values,int spc_analysis_type){ sid=spc_sid; nodeid=spc_nodeid; dof=spc_dof; nsteps=spc_nsteps; if(spc_nsteps){ - values=xNew(spc_nsteps); - times=xNew(spc_nsteps); - memcpy(values,spc_values,nsteps*sizeof(double)); - memcpy(times,spc_times,nsteps*sizeof(double)); + values=xNew(spc_nsteps); + times=xNew(spc_nsteps); + xMemCpy(values,spc_values,nsteps); + xMemCpy(times,spc_times,nsteps); } analysis_type=spc_analysis_type; return; @@ -48,8 +48,8 @@ /*}}}*/ /*FUNCTION SpcTransient::~SpcTransient{{{*/ SpcTransient::~SpcTransient(){ - xDelete(times); - xDelete(values); + xDelete(times); + xDelete(values); return; } /*}}}*/ @@ -111,10 +111,10 @@ void SpcTransient::ConstrainNode(Nodes* nodes,Parameters* parameters){ Node* node=NULL; - double time=0; + IssmDouble time=0; int i; - double alpha=-1; - double value; + IssmDouble alpha=-1; + IssmDouble value; bool found=false; /*Chase through nodes and find the node to which this SpcTransient applys: */ @@ -169,7 +169,7 @@ } /*}}}*/ /*FUNCTION SpcTransient::GetValue {{{*/ -double SpcTransient::GetValue(){ +IssmDouble SpcTransient::GetValue(){ return values[0]; } /*}}}*/