Changeset 20500 for issm/trunk/src/c/classes/Inputs/ControlInput.cpp

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/classes/Inputs/ControlInput.cpp (modified) (2 diffs)

issm/trunk ¶

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/src/c/classes/Inputs/ControlInput.cpp ¶

@@ -71 +71 @@
 }
 /*}}}*/
-int    ControlInput::Id(void){ return -1; }/*{{{*/
-/*}}}*/
-int ControlInput::ObjectEnum(void){/*{{{*/
+int  ControlInput::Id(void){ return -1; }/*{{{*/
+/*}}}*/
+int  ControlInput::ObjectEnum(void){/*{{{*/
 
         return ControlInputEnum;
@@ -96 +96 @@
 }
 /*}}}*/
+void ControlInput::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
+
+        MARSHALLING_ENUM(ControlInputEnum);
+
+        MARSHALLING(enum_type);
+        MARSHALLING(control_id);
+
+        if (marshall_direction == MARSHALLING_BACKWARD){
+                switch(enum_type){
+                        case TriaInputEnum:
+                                values     =new TriaInput();
+                                savedvalues=new TriaInput();
+                                minvalues  =new TriaInput();
+                                maxvalues  =new TriaInput();
+                                gradient   =new TriaInput();
+                                break;
+                        case PentaInputEnum:
+                                values     =new PentaInput();
+                                savedvalues=new PentaInput();
+                                minvalues  =new PentaInput();
+                                maxvalues  =new PentaInput();
+                                gradient   =new PentaInput();
+                                break;
+                        default:
+                                _error_("Input of Enum " << EnumToStringx(enum_type) << " not supported yet by ControlInput");
+                }
+        }
+        if(values) this->values->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+        if(savedvalues) this->savedvalues->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+        if(minvalues) this->minvalues->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+        if(maxvalues) this->maxvalues->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+        if(gradient) this->gradient->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+}
+/*}}}*/
 
 /*ControlInput management*/

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad