Changeset 24529

Timestamp:

01/24/20 11:58:22 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing hydro sub time steps

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCInefficientAnalysis.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

@@ -380 +380 @@
                         dummy_input = basalelement->GetInput2(SmbRunoffEnum); _assert_(dummy_input);
                 }
-                _assert_(surface_runoff_input->InstanceEnum()==TransientInput2Enum);
+                _assert_(dummy_input->InstanceEnum()==TransientInput2Enum);
                 surface_runoff_input=xDynamicCast<TransientInput2*>(dummy_input); _assert_(surface_runoff_input);
         }

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

@@ -5232 +5232 @@
                 this->inputs2->DeleteInput(transientinput_enum[i]);
                 this->inputs2->SetTransientInput(transientinput_enum[i],NULL,0);
+
+                /*We need to configure this input!*/
+                TransientInput2* transientinput = this->inputs2->GetTransientInput(transientinput_enum[i]); _assert_(transientinput);
+                transientinput->Configure(this->parameters);
         }
 }
@@ -5247 +5251 @@
                                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
                                 TransientInput2* transientinput = this->inputs2->GetTransientInput(transientinput_enum[i]); _assert_(transientinput);
-                                _assert_(transientinput);
 
                                 /*Get values and lid list*/
@@ -5263 +5266 @@
                                 xDelete<IssmDouble>(values);
                                 xDelete<int>(vertexlids);
-
-                                //transientinput->Configure(this->parameters);
                         }
                 }