Changeset 24342

Timestamp:

11/16/19 23:01:19 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed DC

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Tria.cpp (modified) (1 diff)
• FemModel.cpp (modified) (2 diffs)
• Inputs2/TransientInput2.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -3267 +3267 @@
                                 if(xIsInf<IssmDouble>(values[i])) _error_("Inf found in vector");
                         }
-                        //this->inputs->AddInput(new TriaInput(name,values,this->element_type));
-                        _error_("not implemented");
+                        if(this->element_type==P1Enum){
+                                inputs2->SetTriaInput(name,P1Enum,NUMVERTICES,lidlist,values);
+                        }
+                        else{
+                                inputs2->SetTriaInput(name,this->element_type,this->lid,numnodes,values);
+                        }
                         break;
 

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

@@ -5141 +5141 @@
 
         for(int i=0;i<numoutputs;i++){
-                if(transientinput_enum[i]<0){
-                        _error_("Can't deal with non enum fields for result Stack");
-                }
-                else{
-                        _error_("not implemented with inputs2");
-                        for(int j=0;j<elements->Size();j++){
-                                /*Intermediaries*/
-                                TransientInput* transient_input = new TransientInput(transientinput_enum[i]);
-                                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
-                                element->inputs->AddInput(transient_input);
-                        }
-                }
+                this->inputs2->DeleteInput(transientinput_enum[i]);
+                this->inputs2->SetTransientInput(transientinput_enum[i],NULL,0);
         }
 }
@@ -5165 +5155 @@
                         for(int j=0;j<elements->Size();j++){
                                 /*Intermediaries*/
+                                _error_("TODO");
                                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
                                 Input* input=element->inputs->GetInput(transientinput_enum[i]); _assert_(input); //this is the enum stack

issm/trunk-jpl/src/c/classes/Inputs2/TransientInput2.cpp

@@ -37 +37 @@
 
         /*Allocate values and timesteps, and copy: */
-        _assert_(N>0 && N<1e6);
+        _assert_(N>=0 && N<1e6);
         this->numtimesteps=N;
-        this->timesteps=xNew<IssmDouble>(N);
-        xMemCpy(this->timesteps,timesin,N);
-
-        this->inputs     = xNew<Input2*>(N);
-        for(int i=0;i<N;i++) this->inputs[i] = NULL;
+        if(N>0){
+                this->timesteps=xNew<IssmDouble>(N);
+                xMemCpy(this->timesteps,timesin,N);
+
+                this->inputs     = xNew<Input2*>(N);
+                for(int i=0;i<N;i++) this->inputs[i] = NULL;
+        }
+        else{
+                this->timesteps=0;
+                this->inputs   =0;
+        }
         this->parameters = NULL;
-
         this->current_input=NULL;
         this->current_step=-1;