Changeset 25481

Timestamp:

08/26/20 19:25:33 (5 years ago)

Author:

schlegel

Message:

CHG: remove array marshalling, only use dyanmic

Location:

issm/trunk-jpl/src/c

Files:

• classes/Node.cpp (modified) (1 diff)
• classes/Params/TransientArrayParam.cpp (modified) (1 diff)
• classes/Params/TransientParam.cpp (modified) (1 diff)
• shared/io/Marshalling/Marshalling.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Node.cpp

@@ -258 +258 @@
         MARSHALLING(indexingupdate);
         MARSHALLING(analysis_enum);
-        MARSHALLING_ARRAY(coord_system,IssmDouble,9);
+        
+        for(int k=0;k<3;k++) for(int l=0;l<3;l++) MARSHALLING(coord_system[k][l]);
 
         MARSHALLING(gsize);

issm/trunk-jpl/src/c/classes/Params/TransientArrayParam.cpp

@@ -85 +85 @@
                 timesteps = xNew<IssmDouble>(N);
         }
-        MARSHALLING_ARRAY(values,IssmDouble,M*N);
-        MARSHALLING_ARRAY(timesteps,IssmDouble,N);
+        MARSHALLING_DYNAMIC(values,IssmDouble,M*N);
+        MARSHALLING_DYNAMIC(timesteps,IssmDouble,N);
 
 }/*}}}*/

issm/trunk-jpl/src/c/classes/Params/TransientParam.cpp

@@ -79 +79 @@
                 timesteps=xNew<IssmDouble>(N);
         }
-        MARSHALLING_ARRAY(values,IssmDouble,N);
-        MARSHALLING_ARRAY(timesteps,IssmDouble,N);
+        MARSHALLING_DYNAMIC(values,IssmDouble,N);
+        MARSHALLING_DYNAMIC(timesteps,IssmDouble,N);
 
 }

issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h

@@ -43 +43 @@
 
 
-#define MARSHALLING_ARRAY(FIELD,TYPE,SIZE) \
-        \
-        if(marshall_direction==MARSHALLING_FORWARD){\
-                memcpy(*pmarshalled_data,FIELD,SIZE*sizeof(TYPE));\
-                *pmarshalled_data+=SIZE*sizeof(TYPE);\
-        }\
-        else if(marshall_direction==MARSHALLING_SIZE){\
-                *pmarshalled_data_size+=SIZE*sizeof(TYPE);\
-        }\
-        else if(marshall_direction==MARSHALLING_BACKWARD){\
-                memcpy(FIELD,*pmarshalled_data,SIZE*sizeof(TYPE));\
-                *pmarshalled_data+=SIZE*sizeof(TYPE);\
-        }\
-        else _error_("Wrong direction during the Marshall process");
-
-
 #define MARSHALLING_DYNAMIC(FIELD,TYPE,SIZE) \
         \