Index: /issm/trunk/src/c/Container/Inputs.cpp =================================================================== --- /issm/trunk/src/c/Container/Inputs.cpp (revision 4697) +++ /issm/trunk/src/c/Container/Inputs.cpp (revision 4698) @@ -95,62 +95,4 @@ input->GetParameterValue(pvalue,gauss); } -} -/*}}}*/ -/*FUNCTION Inputs::GetParameterValue(double* pvalue, Node* node, int enum_type){{{1*/ -void Inputs::GetParameterValue(double* pvalue,Node* node,int enum_type){ - - /*given a node, instead of a gauss point, we want to recover a value: probably in an element!: */ - - vector::iterator object; - Input* input=NULL; - bool found=false; - - /*Go through inputs and check whether any input with the same name is already in: */ - for ( object=objects.begin() ; object < objects.end(); object++ ){ - - input=(Input*)(*object); - if (input->EnumType()==enum_type){ - found=true; - break; - } - } - - if (!found){ - /*we could not find an input with the correct enum type. No defaults values were provided, - * error out: */ - ISSMERROR("could not find input with enum type %i (%s)",enum_type,EnumAsString(enum_type)); - } - - /*Ok, we have an input if we made it here, request the input to return the values: */ - input->GetParameterValue(pvalue,node); -} -/*}}}*/ -/*FUNCTION Inputs::GetParameterValue(double* pvalue, Node* node1, Node* node2,int enum_type){{{1*/ -void Inputs::GetParameterValue(double* pvalue,Node* node1, Node* node2,double gauss_coord,int enum_type){ - - /*given a node, instead of a gauss point, we want to recover a value: probably in an element!: */ - - vector::iterator object; - Input* input=NULL; - bool found=false; - - /*Go through inputs and check whether any input with the same name is already in: */ - for ( object=objects.begin() ; object < objects.end(); object++ ){ - - input=(Input*)(*object); - if (input->EnumType()==enum_type){ - found=true; - break; - } - } - - if (!found){ - /*we could not find an input with the correct enum type. No defaults values were provided, - * error out: */ - ISSMERROR("could not find input with enum type %i (%s)",enum_type,EnumAsString(enum_type)); - } - - /*Ok, we have an input if we made it here, request the input to return the values: */ - input->GetParameterValue(pvalue,node1,node2,gauss_coord); } /*}}}*/ Index: /issm/trunk/src/c/Container/Inputs.h =================================================================== --- /issm/trunk/src/c/Container/Inputs.h (revision 4697) +++ /issm/trunk/src/c/Container/Inputs.h (revision 4698) @@ -37,6 +37,4 @@ void GetParameterValue(int* pvalue,int enum_type); void GetParameterValue(double* pvalue,int enum_type); - void GetParameterValue(double* pvalue,Node* node,int enum_type); - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord,int enum_type); void GetParameterValue(double* pvalue,double* gauss,int enum_type); void GetParameterValue(double* pvalue,double* gauss,int enum_type,double defaultvalue); Index: /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp =================================================================== --- /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp (revision 4697) +++ /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp (revision 4698) @@ -1,351 +1,1 @@ -/*!\file RiftConstraints.cpp - * \brief: manage penalties for rifts - */ - -#include "./PenaltyConstraintsLocal.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../include/include.h" -#include "../../shared/shared.h" - -#define _ZIGZAGCOUNTER_ - -int RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type){ - - int num_unstable_constraints=0; - int converged=0; - int potential; - extern int my_rank; - ISSMERROR(" check analysis_type across all routine!"); - - Constrain(&num_unstable_constraints,loads); - if(num_unstable_constraints==0)converged=1; - - - if(IsFrozen(loads)){ - converged=1; - num_unstable_constraints=0; - } - else if(num_unstable_constraints<=min_mechanical_constraints){ - _printf_(" freezing constraints\n"); - FreezeConstraints(loads); - } - - /*Assign output pointers: */ - *pconverged=converged; - *pnum_unstable_constraints=num_unstable_constraints; -} - -int IsMaterialStable(Loads* loads){ - - int i; - - Riftfront* riftfront=NULL; - int found=0; - int mpi_found=0; - - /*go though loads, and if non-linearity of the material has converged, let all penalties know: */ - for (i=0;iSize();i++){ - - if(RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - - if (riftfront->IsMaterialStable()){ - found=1; - /*do not break! all penalties should get informed the non-linearity converged!*/ - } - } - } - - #ifdef _PARALLEL_ - MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); - MPI_Bcast(&mpi_found,1,MPI_INT,0,MPI_COMM_WORLD); - found=mpi_found; - #endif - - return found; -} - -int RiftIsPresent(Loads* loads,int analysis_type){ - - - int i; - - int found=0; - int mpi_found=0; - - /*go though loads, and figure out if one of the loads is a Riftfront: */ - for (i=0;iSize();i++){ - Load* load=(Load*)loads->GetObjectByOffset(i); - if(load->InAnalysis(analysis_type)){ - if(RiftfrontEnum==loads->GetEnum(i)){ - found=1; - break; - } - } - } - - #ifdef _PARALLEL_ - MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); - MPI_Bcast(&mpi_found,1,MPI_INT,0,MPI_COMM_WORLD); - found=mpi_found; - #endif - - return found; -} - -int IsPreStable(Loads* loads){ - - - int i; - - Riftfront* riftfront=NULL; - int found=0; - int mpi_found=0; - - /*go though loads, and figure out if one of the penpair loads is still not stable: */ - for (i=0;iSize();i++){ - - if(RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - - if (riftfront->PreStable()==0){ - found=1; - break; - } - } - } - - #ifdef _PARALLEL_ - MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); - MPI_Bcast(&mpi_found,1,MPI_INT,0,MPI_COMM_WORLD); - found=mpi_found; - #endif - - if (found){ - /*We found an unstable constraint. : */ - return 0; - } - else{ - return 1; - } -} - -int SetPreStable(Loads* loads){ - - - int i; - - Riftfront* riftfront=NULL; - int found=0; - int mpi_found=0; - - /*go though loads, and set loads to pre stable.:*/ - for (i=0;iSize();i++){ - - if(RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - riftfront->SetPreStable(); - } - } -} - -int PreConstrain(int* pnum_unstable_constraints,Loads* loads){ - - int i; - - /* generic object pointer: */ - Riftfront* riftfront=NULL; - - int unstable; - int sum_num_unstable_constraints; - int num_unstable_constraints=0; - - /*Enforce constraints: */ - for (i=0;iSize();i++){ - - if (RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - - riftfront->PreConstrain(&unstable); - - num_unstable_constraints+=unstable; - } - } - - #ifdef _PARALLEL_ - MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); - MPI_Bcast(&sum_num_unstable_constraints,1,MPI_INT,0,MPI_COMM_WORLD); - num_unstable_constraints=sum_num_unstable_constraints; - #endif - - /*Assign output pointers: */ - *pnum_unstable_constraints=num_unstable_constraints; - -} - -int Constrain(int* pnum_unstable_constraints,Loads* loads){ - - int i; - - /* generic object pointer: */ - Riftfront* riftfront=NULL; - - int unstable; - int sum_num_unstable_constraints; - int num_unstable_constraints=0; - - /*Enforce constraints: */ - for (i=0;iSize();i++){ - - if (RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - - riftfront->Constrain(&unstable); - - num_unstable_constraints+=unstable; - } - } - - #ifdef _PARALLEL_ - MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); - MPI_Bcast(&sum_num_unstable_constraints,1,MPI_INT,0,MPI_COMM_WORLD); - num_unstable_constraints=sum_num_unstable_constraints; - #endif - - /*Assign output pointers: */ - *pnum_unstable_constraints=num_unstable_constraints; - -} - -void FreezeConstraints(Loads* loads){ - - int i; - - /* generic object pointer: */ - Riftfront* riftfront=NULL; - - /*Enforce constraints: */ - for (i=0;iSize();i++){ - - if (RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - - riftfront->FreezeConstraints(); - - } - } - -} - -int IsFrozen(Loads* loads){ - - int i; - - /* generic object pointer: */ - Riftfront* riftfront=NULL; - int found=0; - int mpi_found=0; - - /*Enforce constraints: */ - for (i=0;iSize();i++){ - - if (RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - if (riftfront->IsFrozen()){ - found=1; - break; - } - } - } - - /*Is there just one found? that would mean we have frozen! : */ - #ifdef _PARALLEL_ - MPI_Reduce (&found,&mpi_found,1,MPI_DOUBLE,MPI_MAX,0,MPI_COMM_WORLD ); - MPI_Bcast(&mpi_found,1,MPI_DOUBLE,0,MPI_COMM_WORLD); - found=mpi_found; - #endif - - return found; -} - -int MaxPenetrationInInputs(Loads* loads){ - - int i; - - /* generic object pointer: */ - Riftfront* riftfront=NULL; - - /*rift penetration: */ - double max_penetration=0; - double mpi_max_penetration; - double penetration; - - /*Ok, we are going to find the grid pairs which are not penetrating, even though they - * are penalised. We will release only the one with has least <0 penetration. : */ - - max_penetration=0; - for (i=0;iSize();i++){ - - if (RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - - riftfront->MaxPenetration(&penetration); - - if (penetration>max_penetration)max_penetration=penetration; - } - } - - #ifdef _PARALLEL_ - MPI_Reduce (&max_penetration,&mpi_max_penetration,1,MPI_DOUBLE,MPI_MAX,0,MPI_COMM_WORLD ); - MPI_Bcast(&mpi_max_penetration,1,MPI_DOUBLE,0,MPI_COMM_WORLD); - max_penetration=mpi_max_penetration; - #endif - - /*feed max_penetration to inputs: */ - for(i=0;iSize();i++){ - Load* load=(Load*)loads->GetObjectByOffset(i); - load->InputUpdateFromVector(&max_penetration,MaxPenetrationEnum,ConstantEnum); - } -} - -int PotentialUnstableConstraints(Loads* loads){ - - int i; - - /* generic object pointer: */ - Riftfront* riftfront=NULL; - - /*Ok, we are going to find the grid pairs which are not penetrating, even though they - * are penalised. We will release only the one with has least <0 penetration. : */ - int unstable=0; - int sum_num_unstable_constraints=0; - int num_unstable_constraints=0; - - for (i=0;iSize();i++){ - - if (RiftfrontEnum==loads->GetEnum(i)){ - - riftfront=(Riftfront*)loads->GetObjectByOffset(i); - - riftfront->PotentialUnstableConstraint(&unstable); - - num_unstable_constraints+=unstable; - } - } - - #ifdef _PARALLEL_ - MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); - MPI_Bcast(&sum_num_unstable_constraints,1,MPI_INT,0,MPI_COMM_WORLD); - num_unstable_constraints=sum_num_unstable_constraints; - #endif - - return num_unstable_constraints; -} +s: Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4697) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4698) @@ -5233,4 +5233,37 @@ } /*}}}*/ +/*FUNCTION Tria::GetParameterValue(double* pvalue,Node* node,int enumtype) {{{1*/ +void Tria::GetParameterValue(double* pvalue,Node* node,int enumtype){ + + /*Output*/ + double value; + + /*Intermediaries*/ + const int numnodes=3; + int i; + double gauss_tria[numnodes]={0.0}; + + /*go through 3 nodes (all nodes for tria) and identify node: */ + ISSMASSERT(nodes); + for(i=0;iinputs->GetParameterValue(&value, &gauss_tria[0],enumtype); + + /*Assign output pointers:*/ + *pvalue=value; + return; + + } + } + + /*If we reach tis point, the node provided has not been found;*/ + ISSMERROR("The node provided are either the same or did not match current Tria nodes"); +} +/*}}}*/ /*FUNCTION Tria::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_seg,int enumtype) {{{1*/ void Tria::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_seg,int enumtype){ Index: /issm/trunk/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.h (revision 4697) +++ /issm/trunk/src/c/objects/Elements/Tria.h (revision 4698) @@ -151,4 +151,5 @@ void GetParameterDerivativeValue(double* p, double* plist,double* xyz_list, double* gauss_l1l2l3); void GetParameterValue(double* pp, double* plist, double* gauss_l1l2l3); + void GetParameterValue(double* pvalue,Node* node,int enumtype); void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_seg,int enumtype); void GetSolutionFromInputsDiagnosticHoriz(Vec solution); Index: /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp (revision 4698) @@ -186,10 +186,4 @@ void BeamVertexInput::GetParameterValue(double* pvalue){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION BeamVertexInput::GetParameterValue(double* pvalue,Node* node){{{1*/ -void BeamVertexInput::GetParameterValue(double* pvalue,Node* node){ISSMERROR(" not supported yet!");} -/*}}}*/ -/*FUNCTION BeamVertexInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){{{1*/ -void BeamVertexInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){ISSMERROR(" not supported yet!");} -/*}}}*/ /*FUNCTION BeamVertexInput::GetParameterValue(double* pvalue,double* gauss){{{1*/ void BeamVertexInput::GetParameterValue(double* pvalue,double* gauss){ Index: /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h (revision 4698) @@ -48,6 +48,4 @@ void GetParameterValue(int* pvalue); void GetParameterValue(double* pvalue); - void GetParameterValue(double* pvalue,Node* node); - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord); void GetParameterValue(double* pvalue,double* gauss); void GetParameterValue(double* pvalue,double* gauss,double defaultvalue); Index: /issm/trunk/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 4698) @@ -196,10 +196,4 @@ void BoolInput::GetParameterValue(double* pvalue){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetParameterValue(double* pvalue,Node* node){{{1*/ -void BoolInput::GetParameterValue(double* pvalue,Node* node){ISSMERROR(" not supported yet!");} -/*}}}*/ -/*FUNCTION BoolInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){{{1*/ -void BoolInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){ISSMERROR(" not supported yet!");} -/*}}}*/ /*FUNCTION BoolInput::GetParameterValue(double* pvalue,double* gauss){{{1*/ void BoolInput::GetParameterValue(double* pvalue,double* gauss){ISSMERROR(" not supported yet!");} Index: /issm/trunk/src/c/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 4698) @@ -48,6 +48,4 @@ void GetParameterValue(int* pvalue); void GetParameterValue(double* pvalue); - void GetParameterValue(double* pvalue,Node* node); - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord); void GetParameterValue(double* pvalue,double* gauss); void GetParameterValue(double* pvalue,double* gauss,double defaultvalue); Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 4698) @@ -209,10 +209,4 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetParameterValue(double* pvalue,Node* node){{{1*/ -void DoubleInput::GetParameterValue(double* pvalue,Node* node){ISSMERROR(" not supported yet!");} -/*}}}*/ -/*FUNCTION DoubleInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){{{1*/ -void DoubleInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){ISSMERROR(" not supported yet!");} -/*}}}*/ /*FUNCTION DoubleInput::GetParameterValue(double* pvalue,double* gauss){{{1*/ void DoubleInput::GetParameterValue(double* pvalue,double* gauss){ISSMERROR(" not supported yet!");} Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 4698) @@ -47,6 +47,4 @@ void GetParameterValue(int* pvalue); void GetParameterValue(double* pvalue); - void GetParameterValue(double* pvalue,Node* node); - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord); void GetParameterValue(double* pvalue,double* gauss); void GetParameterValue(double* pvalue,double* gauss,double defaultvalue); Index: /issm/trunk/src/c/objects/Inputs/Input.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/Input.h (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/Input.h (revision 4698) @@ -25,6 +25,4 @@ virtual void GetParameterValue(int* pvalue)=0; virtual void GetParameterValue(double* pvalue)=0; - virtual void GetParameterValue(double* pvalue,Node* node)=0; - virtual void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord)=0; virtual void GetParameterValue(double* pvalue,double* gauss)=0; virtual void GetParameterValue(double* pvalue,double* gauss,double defaultvalue)=0; Index: /issm/trunk/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 4698) @@ -195,10 +195,4 @@ } /*}}}*/ -/*FUNCTION IntInput::GetParameterValue(double* pvalue,Node* node){{{1*/ -void IntInput::GetParameterValue(double* pvalue,Node* node){ISSMERROR(" not supported yet!");} -/*}}}*/ -/*FUNCTION IntInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){{{1*/ -void IntInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){ISSMERROR(" not supported yet!");} -/*}}}*/ /*FUNCTION IntInput::GetParameterValue(double* pvalue,double* gauss){{{1*/ void IntInput::GetParameterValue(double* pvalue,double* gauss){ISSMERROR(" not supported yet!");} Index: /issm/trunk/src/c/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 4698) @@ -48,6 +48,4 @@ void GetParameterValue(int* pvalue); void GetParameterValue(double* pvalue); - void GetParameterValue(double* pvalue,Node* node); - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord); void GetParameterValue(double* pvalue,double* gauss); void GetParameterValue(double* pvalue,double* gauss,double defaultvalue); Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 4698) @@ -218,10 +218,4 @@ /*FUNCTION PentaVertexInput::GetParameterValue(double* pvalue){{{1*/ void PentaVertexInput::GetParameterValue(double* pvalue){ISSMERROR(" not supported yet!");} -/*}}}*/ -/*FUNCTION PentaVertexInput::GetParameterValue(double* pvalue,Node* node){{{1*/ -void PentaVertexInput::GetParameterValue(double* pvalue,Node* node){ISSMERROR(" not supported yet!");} -/*}}}*/ -/*FUNCTION PentaVertexInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){{{1*/ -void PentaVertexInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){ISSMERROR(" not supported yet!");} /*}}}*/ /*FUNCTION PentaVertexInput::GetParameterValue(double* pvalue,double* gauss){{{1*/ Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 4698) @@ -47,6 +47,4 @@ void GetParameterValue(int* pvalue); void GetParameterValue(double* pvalue); - void GetParameterValue(double* pvalue,Node* node); - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord); void GetParameterValue(double* pvalue,double* gauss); void GetParameterValue(double* pvalue,double* gauss,double defaultvalue); Index: /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp (revision 4698) @@ -179,10 +179,4 @@ } /*}}}*/ -/*FUNCTION SingVertexInput::GetParameterValue(double* pvalue,Node* node){{{1*/ -void SingVertexInput::GetParameterValue(double* pvalue,Node* node){ISSMERROR(" not supported yet!");} -/*}}}*/ -/*FUNCTION SingVertexInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){{{1*/ -void SingVertexInput::GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){ISSMERROR(" not supported yet!");} -/*}}}*/ /*FUNCTION SingVertexInput::GetParameterValue(double* pvalue,double* gauss){{{1*/ void SingVertexInput::GetParameterValue(double* pvalue,double* gauss){ISSMERROR(" not supported yet!");} Index: /issm/trunk/src/c/objects/Inputs/SingVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/SingVertexInput.h (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/SingVertexInput.h (revision 4698) @@ -47,6 +47,4 @@ void GetParameterValue(int* pvalue); void GetParameterValue(double* pvalue); - void GetParameterValue(double* pvalue,Node* node); - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord); void GetParameterValue(double* pvalue,double* gauss); void GetParameterValue(double* pvalue,double* gauss,double defaultvalue); Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 4697) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 4698) @@ -49,6 +49,4 @@ void GetParameterValue(double* pvalue){ISSMERROR("not implemented yet");} - void GetParameterValue(double* pvalue,Node* node){ISSMERROR("not implemented yet");} - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord){ISSMERROR("not implemented yet");} void GetParameterValue(double* pvalue,double* gauss); void GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR("not implemented yet");} Index: /issm/trunk/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 4697) +++ /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 4698) @@ -377,6 +377,6 @@ /*Recover thickness: */ - tria1->inputs->GetParameterValue(&h[0],nodes[0],ThicknessEnum); - tria2->inputs->GetParameterValue(&h[1],nodes[1],ThicknessEnum); + tria1->GetParameterValue(&h[0],nodes[0],ThicknessEnum); + tria2->GetParameterValue(&h[1],nodes[1],ThicknessEnum); if (h[0]!=h[1])ISSMERROR(" different thicknesses not supported for rift fronts"); @@ -504,12 +504,12 @@ /*get thickness: */ - tria1->inputs->GetParameterValue(&h[0],nodes[0],ThicknessEnum); - tria2->inputs->GetParameterValue(&h[1],nodes[1],ThicknessEnum); + tria1->GetParameterValue(&h[0],nodes[0],ThicknessEnum); + tria2->GetParameterValue(&h[1],nodes[1],ThicknessEnum); if (h[0]!=h[1])ISSMERROR(" different thicknesses not supported for rift fronts"); thickness=h[0]; - tria1->inputs->GetParameterValue(&b[0],nodes[0],BedEnum); - tria2->inputs->GetParameterValue(&b[1],nodes[1],BedEnum); + tria1->GetParameterValue(&b[0],nodes[0],BedEnum); + tria2->GetParameterValue(&b[1],nodes[1],BedEnum); if (b[0]!=b[1])ISSMERROR(" different beds not supported for rift fronts"); @@ -619,8 +619,8 @@ /*First recover velocity: */ - tria1->inputs->GetParameterValue(&vx1,nodes[0],VxEnum); - tria2->inputs->GetParameterValue(&vx2,nodes[1],VxEnum); - tria1->inputs->GetParameterValue(&vy1,nodes[0],VyEnum); - tria2->inputs->GetParameterValue(&vy2,nodes[1],VyEnum); + tria1->GetParameterValue(&vx1,nodes[0],VxEnum); + tria2->GetParameterValue(&vx2,nodes[1],VxEnum); + tria1->GetParameterValue(&vy1,nodes[0],VyEnum); + tria2->GetParameterValue(&vy2,nodes[1],VyEnum); /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ @@ -749,8 +749,8 @@ /*recover velocity: */ - tria1->inputs->GetParameterValue(&vx1,nodes[0],VxEnum); - tria2->inputs->GetParameterValue(&vx2,nodes[1],VxEnum); - tria1->inputs->GetParameterValue(&vy1,nodes[0],VyEnum); - tria2->inputs->GetParameterValue(&vy2,nodes[1],VyEnum); + tria1->GetParameterValue(&vx1,nodes[0],VxEnum); + tria2->GetParameterValue(&vx2,nodes[1],VxEnum); + tria1->GetParameterValue(&vy1,nodes[0],VyEnum); + tria2->GetParameterValue(&vy2,nodes[1],VyEnum); /*Grid 1 faces grid2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ @@ -811,8 +811,8 @@ /*First recover velocity: */ - tria1->inputs->GetParameterValue(&vx1,nodes[0],VxEnum); - tria2->inputs->GetParameterValue(&vx2,nodes[1],VxEnum); - tria1->inputs->GetParameterValue(&vy1,nodes[0],VyEnum); - tria2->inputs->GetParameterValue(&vy2,nodes[1],VyEnum); + tria1->GetParameterValue(&vx1,nodes[0],VxEnum); + tria2->GetParameterValue(&vx2,nodes[1],VxEnum); + tria1->GetParameterValue(&vy1,nodes[0],VyEnum); + tria2->GetParameterValue(&vy2,nodes[1],VyEnum); /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ @@ -861,8 +861,8 @@ /*First recover velocity: */ - tria1->inputs->GetParameterValue(&vx1,nodes[0],VxEnum); - tria2->inputs->GetParameterValue(&vx2,nodes[1],VxEnum); - tria1->inputs->GetParameterValue(&vy1,nodes[0],VyEnum); - tria2->inputs->GetParameterValue(&vy2,nodes[1],VyEnum); + tria1->GetParameterValue(&vx1,nodes[0],VxEnum); + tria2->GetParameterValue(&vx2,nodes[1],VxEnum); + tria1->GetParameterValue(&vy1,nodes[0],VyEnum); + tria2->GetParameterValue(&vy2,nodes[1],VyEnum); /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ @@ -917,8 +917,8 @@ /*First recover velocity: */ - tria1->inputs->GetParameterValue(&vx1,nodes[0],VxEnum); - tria2->inputs->GetParameterValue(&vx2,nodes[1],VxEnum); - tria1->inputs->GetParameterValue(&vy1,nodes[0],VyEnum); - tria2->inputs->GetParameterValue(&vy2,nodes[1],VyEnum); + tria1->GetParameterValue(&vx1,nodes[0],VxEnum); + tria2->GetParameterValue(&vx2,nodes[1],VxEnum); + tria1->GetParameterValue(&vy1,nodes[0],VyEnum); + tria2->GetParameterValue(&vy2,nodes[1],VyEnum); /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */