Changeset 3468

Timestamp:

04/08/10 11:09:08 (15 years ago)

Author:

Mathieu Morlighem

Message:

some debugging

Location:

issm/trunk/src

Files:

• c/objects/DofIndexing.cpp (modified) (1 diff)
• c/objects/Hook.cpp (modified) (1 diff)
• c/objects/NodeProperties.cpp (modified) (1 diff)
• m/classes/public/marshall.m (modified) (1 diff)

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

@@ -125 +125 @@
 
         char* marshalled_dataset=NULL;
+        int   enum_type;
 
         /*recover marshalled_dataset: */
         marshalled_dataset=*pmarshalled_dataset;
 
-        /*this time, no need to get enum type, the pointer directly points to the beginning of the 
-         *object data (thanks to DataSet::Demarshall):*/
+        /*get enum type of object since DofIndexing is not directly called by DataSet: */
+        memcpy(&enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int);
 
         memcpy(&numberofdofs,marshalled_dataset,sizeof(numberofdofs));marshalled_dataset+=sizeof(numberofdofs);

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

@@ -159 +159 @@
         
         /*allocate: */
+        if (num<=0) ISSMERROR("cannot demarshall Hook as num<=0");
         this->ids=(int*)xmalloc(num*sizeof(int));
         this->offsets=(int*)xmalloc(num*sizeof(int));

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

@@ -110 +110 @@
         char* marshalled_dataset=NULL;
         int   i;
+        int   enum_type;
 
         /*recover marshalled_dataset: */
         marshalled_dataset=*pmarshalled_dataset;
 
-        /*this time, no need to get enum type, the pointer directly points to the beginning of the 
-         *object data (thanks to DataSet::Demarshall):*/
+        /*get enum type of object since NodeProperties is not directly called by DataSet: */
+        memcpy(&enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int);
 
         memcpy(&onbed,marshalled_dataset,sizeof(onbed));marshalled_dataset+=sizeof(onbed);

issm/trunk/src/m/classes/public/marshall.m

@@ -172 +172 @@
 WriteData(fid,md.name,'String','name');
 
-%Get penalties to connect collapsed and non-collapsed 3d meshes: 
-if strcmpi(md.type,'3d'),
-        WriteData(fid,md.penalties,'Mat','penalties');
-end
+%Get penalties
+WriteData(fid,md.penalties,'Mat','penalties');
 
 %input and output file names