Changeset 27035 for issm/trunk/src/c/classes/Inputs/TransientInput.cpp

Timestamp:

06/01/22 05:01:48 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27033

Location:

issm/trunk

Files:

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

issm/trunk/src/c/classes/Inputs/TransientInput.cpp

@@ -125 +125 @@
 void TransientInput::Marshall(MarshallHandle* marshallhandle){ /*{{{*/
 
+        bool isnull;
+
         int object_enum = TransientInputEnum;
    marshallhandle->call(object_enum);
@@ -149 +151 @@
         if(marshallhandle->OperationNumber()!=MARSHALLING_LOAD){
                 for(int i=0;i<this->numtimesteps;i++){
-                        _assert_(this->inputs[i]);
-                        object_enum = this->inputs[i]->ObjectEnum();
-                        marshallhandle->call(object_enum);
-                        this->inputs[i]->Marshall(marshallhandle);
+
+                        //_assert_(this->inputs[i]);
+                        isnull = false;
+                        if(!this->inputs[i]) isnull = true;
+                        marshallhandle->call(isnull);
+
+                        if(!isnull){
+                                object_enum = this->inputs[i]->ObjectEnum();
+                                marshallhandle->call(object_enum);
+                                this->inputs[i]->Marshall(marshallhandle);
+                        }
                 }
         }
         else{
                 for(int i=0;i<this->numtimesteps;i++){
-                        marshallhandle->call(object_enum);
-
-                        if(object_enum==TriaInputEnum){
-                                TriaInput* triainput2=new TriaInput();
-                                triainput2->Marshall(marshallhandle);
-                                this->inputs[i]=triainput2;
-                        }
-                        else if(object_enum==PentaInputEnum){
-                                PentaInput* pentainput2=new PentaInput();
-                                pentainput2->Marshall(marshallhandle);
-                                this->inputs[i]=pentainput2;
-                        }
-                        else{
-                                _error_("input "<<EnumToStringx(object_enum)<<" not supported");
+                        marshallhandle->call(isnull);
+                        if(!isnull){
+                                marshallhandle->call(object_enum);
+
+                                if(object_enum==TriaInputEnum){
+                                        TriaInput* triainput2=new TriaInput();
+                                        triainput2->Marshall(marshallhandle);
+                                        this->inputs[i]=triainput2;
+                                }
+                                else if(object_enum==PentaInputEnum){
+                                        PentaInput* pentainput2=new PentaInput();
+                                        pentainput2->Marshall(marshallhandle);
+                                        this->inputs[i]=pentainput2;
+                                }
+                                else{
+                                        _error_("input "<<EnumToStringx(object_enum)<<" not supported");
+                                }
                         }
                 }