Changeset 23485

Timestamp:

11/29/18 13:52:21 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed BC reset with the right analysis

File:

• issm/trunk-jpl/src/c/cores/transient_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -373 +373 @@
                                 femmodel->parameters->FindParam(&smb_model,SmbEnum);
                                 if(isenthalpy){
-                                        if(smb_model==SMBpddEnum)                               ResetBoundaryConditions(femmodel,EnthalpyAnalysisEnum);
-                                        if(smb_model==SMBd18opddEnum)                   ResetBoundaryConditions(femmodel,EnthalpyAnalysisEnum);
-                                        if(smb_model==SMBpddSicopolisEnum)      ResetBoundaryConditions(femmodel,EnthalpyAnalysisEnum);
+                                        if(smb_model==SMBpddEnum || smb_model==SMBd18opddEnum || smb_model==SMBpddSicopolisEnum){
+                                                femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
+                                                ResetBoundaryConditions(femmodel,EnthalpyAnalysisEnum);
+                                        }
                                 }
                                 else{
-                                        if(smb_model==SMBpddEnum)                               ResetBoundaryConditions(femmodel,ThermalAnalysisEnum);
-                                        if(smb_model==SMBd18opddEnum)                   ResetBoundaryConditions(femmodel,ThermalAnalysisEnum);
-                                        if(smb_model==SMBpddSicopolisEnum)      ResetBoundaryConditions(femmodel,ThermalAnalysisEnum);
+                                        if(smb_model==SMBpddEnum || smb_model==SMBd18opddEnum || smb_model==SMBpddSicopolisEnum){
+                                                femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);
+                                                ResetBoundaryConditions(femmodel,ThermalAnalysisEnum);
+                                        }
                                 }
                         }