Changeset 7444

Timestamp:

02/14/11 17:01:14 (14 years ago)

Author:

Eric.Larour

Message:

Added gridonwater. + DeepEcho for NodeSets

Location:

issm/trunk/src/c/objects

Files:

• IoModel.cpp (modified) (2 diffs)
• IoModel.h (modified) (1 diff)
• NodeSets.cpp (modified) (1 diff)
• NodeSets.h (modified) (1 diff)

issm/trunk/src/c/objects/IoModel.cpp

@@ -76 +76 @@
         xfree((void**)&this->gridonicesheet);
         xfree((void**)&this->gridoniceshelf);
+        xfree((void**)&this->gridonwater);
         xfree((void**)&this->pressureload);
         xfree((void**)&this->spcvelocity);
@@ -292 +293 @@
         this->gridonicesheet=NULL;
         this->gridoniceshelf=NULL;
+        this->gridonwater=NULL;
 
         this->drag_type=0;

issm/trunk/src/c/objects/IoModel.h

@@ -89 +89 @@
                 double* gridonicesheet;
                 double* gridoniceshelf;
+                double* gridonwater;
 
                 /*friction: */

issm/trunk/src/c/objects/NodeSets.cpp

@@ -30 +30 @@
 /*FUNCTION NodeSets::Echo{{{1*/
 void NodeSets::Echo(void){
+        
+        int i;
+
+        printf("\nNodeSets echo:\n");
+        printf(" gsize: %i\n",gsize);
+        printf(" fsize: %i\n",fsize);
+        printf(" ssize: %i\n",ssize);
+        printf(" pv_f: %p\n",pv_f);
+        printf(" pv_s: %p\n",pv_s);
+
+}/*}}}*/
+/*FUNCTION NodeSets::DeepEcho{{{1*/
+void NodeSets::DeepEcho(void){
         
         int i;

issm/trunk/src/c/objects/NodeSets.h

@@ -26 +26 @@
 
         void Echo();
+        void DeepEcho(void);
         int GetGSize();
         int GetFSize();