Changeset 3818

Timestamp:

05/18/10 13:42:49 (15 years ago)

Author:

seroussi

Message:

neighbors

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (10 diffs)
• PentaHook.cpp (modified) (1 diff)
• PentaHook.h (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -26 +26 @@
         this->matice=NULL;
         this->matpar=NULL;
-        this->neighboors=NULL;
+        this->neighbors=NULL;
         
         this->inputs=NULL;
@@ -64 +64 @@
         this->InitHookMatice(penta_matice_id);this->matice=NULL;
         this->InitHookMatpar(penta_matpar_id);this->matpar=NULL;
-        this->InitHookNeighboors(penta_elements_ids);this->neighboors=NULL;
+        this->InitHookNeighboors(penta_elements_ids);this->neighbors=NULL;
 
         //intialize inputs, and add as many inputs per element as requested: 
@@ -202 +202 @@
         penta->hmatice.copy(&this->hmatice);
         penta->hmatpar.copy(&this->hmatpar);
-        penta->hneighboors.copy(&this->hneighboors);
+        penta->hneighbors.copy(&this->hneighbors);
 
         /*recover objects: */
@@ -208 +208 @@
         penta->matice=(Matice*)penta->hmatice.delivers();
         penta->matpar=(Matpar*)penta->hmatpar.delivers();
-        penta->neighboors=(Penta*)penta->hneighboors.deliverp();
+        penta->neighbors=(Penta*)penta->hneighbors.deliverp();
 
         return penta;
@@ -223 +223 @@
         this->hmatice.configure(materialsin);
         this->hmatpar.configure(materialsin);
-        this->hneighboors.configure(elementsin);
+        this->hneighbors.configure(elementsin);
 
         /*Now, go pick up the objects inside the hooks: */
@@ -229 +229 @@
         this->matice=(Matice*)this->hmatice.delivers();
         this->matpar=(Matpar*)this->hmatpar.delivers();
-        this->neighboors=(Penta*)this->hneighboors.deliverp();
+        this->neighbors=(Penta*)this->hneighbors.deliverp();
 
         /*point parameters to real dataset: */
@@ -254 +254 @@
         hmatice.Demarshall(&marshalled_dataset);
         hmatpar.Demarshall(&marshalled_dataset);
-        hneighboors.Demarshall(&marshalled_dataset);
+        hneighbors.Demarshall(&marshalled_dataset);
 
         /*pointers are garbabe, until configuration is carried out: */
@@ -260 +260 @@
         matice=NULL;
         matpar=NULL;
-        neighboors=NULL;
+        neighbors=NULL;
         
         /*demarshall inputs: */
@@ -332 +332 @@
         hmatice.Marshall(&marshalled_dataset);
         hmatpar.Marshall(&marshalled_dataset);
-        hneighboors.Marshall(&marshalled_dataset);
+        hneighbors.Marshall(&marshalled_dataset);
 
         /*Marshall inputs: */
@@ -355 +355 @@
                 +hmatice.MarshallSize()
                 +hmatpar.MarshallSize()
-                +hneighboors.MarshallSize()
+                +hneighbors.MarshallSize()
                 +inputs->MarshallSize()
                 +sizeof(int); //sizeof(int) for enum type

issm/trunk/src/c/objects/Elements/PentaHook.cpp

@@ -47 +47 @@
 /*FUNCTION PentaHook::InitHookNeighboors(int* element_ids){{{1*/
 void PentaHook::InitHookNeighboors(int* element_ids){
-        this->hneighboors.Init(element_ids,2);
+        this->hneighbors.Init(element_ids,2);
 
 }

issm/trunk/src/c/objects/Elements/PentaHook.h

@@ -14 +14 @@
                 Hook hmatice; // 1 ice material
                 Hook hmatpar; // 1 material parameter
-                Hook hneighboors; // 2 elements, first down, second up
+                Hook hneighbors; // 2 elements, first down, second up