Context Navigation

Changeset 4274

Timestamp:

06/28/10 15:22:03 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added Extrude method for inputs

Location:

issm/trunk/src/c/objects

Files:

-              r4273
+              r4274
         if isnan(iomodel->upperelements[index]){
                 penta_elements_ids[0]=this->id; //upper penta is the same penta
+                penta_elements_ids[1]=this->id; //upper penta is the same penta
+        }
         else{
                 penta_elements_ids[0]=(int)(iomodel->upperelements[index]);
+                penta_elements_ids[1]=(int)(iomodel->upperelements[index]);
+        }
         if isnan(iomodel->lowerelements[index]){
                 penta_elements_ids[1]=this->id; //lower penta is the same penta
+                penta_elements_ids[0]=this->id; //lower penta is the same penta
+        }
         else{
                 penta_elements_ids[1]=(int)(iomodel->lowerelements[index]);
+                penta_elements_ids[0]=(int)(iomodel->lowerelements[index]);
+        }
         this->InitHookNodes(nummodels);this->nodes=NULL;
 …
         Input* original_input=NULL;
         /*Make a copy of the original input: */
+        /*Extrude the original input: */
         original_input=(Input*)this->inputs->GetInput(enum_type);
+        original_input->Extrude();
         /*recover parameters: */

r4248	r4274
69	69	void AXPY(Input* xinput,double scalar);
70	70	void Constrain(double cm_min, double cm_max);
	71	void Extrude(void){ISSMERROR("not supported yet");};
71	72	void GetVectorFromInputs(Vec vector,int* doflist);
72	73	void GetValuesPtr(double** pvalues,int* pnum_values);

r4248	r4274
69	69	void AXPY(Input* xinput,double scalar);
70	70	void Constrain(double cm_min, double cm_max);
	71	void Extrude(void){ISSMERROR("not supported yet");};
71	72	void GetVectorFromInputs(Vec vector,int* doflist);
72	73	void GetValuesPtr(double** pvalues,int* pnum_values);

r4248	r4274
68	68	void AXPY(Input* xinput,double scalar);
69	69	void Constrain(double cm_min, double cm_max);
	70	void Extrude(void){ISSMERROR("not supported yet");};
70	71	void GetVectorFromInputs(Vec vector,int* doflist);
71	72	void GetValuesPtr(double** pvalues,int* pnum_values);

r4248	r4274
52	52	virtual void AXPY(Input* xinput,double scalar)=0;
53	53	virtual void Constrain(double cm_min, double cm_max)=0;
	54	virtual void Extrude()=0;
54	55	virtual void GetVectorFromInputs(Vec vector,int* doflist)=0;
55	56	virtual void GetValuesPtr(double** pvalues,int* pnum_values)=0;

r4248	r4274
69	69	void AXPY(Input* xinput,double scalar);
70	70	void Constrain(double cm_min, double cm_max);
	71	void Extrude(void){ISSMERROR("not supported yet");};
71	72	void GetVectorFromInputs(Vec vector,int* doflist);
72	73	void GetValuesPtr(double** pvalues,int* pnum_values);

-              r4248
+              r4274
+}
 /*}}}*/
+/*FUNCTION PentaVertexInput::Extrude(double cm_min, double cm_max){{{1*/
+void PentaVertexInput::Extrude(void){
+        int i;
+        /*First 3 values copied on 3 last values*/
+        for(i=0;i<3;i++) this->values[3+i]=this->values[i];
+}
+/*}}}*/
 /*FUNCTION PentaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
 void PentaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){

r4248	r4274
78	78	void AXPY(Input* xinput,double scalar);
79	79	void Constrain(double cm_min, double cm_max);
	80	void Extrude(void);
80	81	void GetVectorFromInputs(Vec vector,int* doflist);
81	82	void GetValuesPtr(double** pvalues,int* pnum_values);

r4248	r4274
68	68	void AXPY(Input* xinput,double scalar);
69	69	void Constrain(double cm_min, double cm_max);
	70	void Extrude(void){ISSMERROR("not supported yet");};
70	71	void GetVectorFromInputs(Vec vector,int* doflist);
71	72	void GetValuesPtr(double** pvalues,int* pnum_values);

r4248	r4274
76	76	void AXPY(Input* xinput,double scalar);
77	77	void Constrain(double cm_min, double cm_max);
	78	void Extrude(void){ISSMERROR("not supported yet");};
78	79	void GetVectorFromInputs(Vec vector,int* doflist);
79	80	void GetValuesPtr(double** pvalues,int* pnum_values);

Note: See TracChangeset for help on using the changeset viewer.