Changeset 9126

Timestamp:

07/26/11 17:43:41 (14 years ago)

Author:

Eric.Larour

Message:

Reinitialize temperature to qmu temperature at each qmu step, to avoid fake sensitivities.

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (modified) (1 diff)
• modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• solutions/thermal_core.cpp (modified) (3 diffs)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -546 +546 @@
         NumRequestedOutputsEnum,
         BasalFrictionEnum,
-        ViscousHeatingEnum
+        ViscousHeatingEnum,
+        QmuTemperatureEnum
 };
 

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -488 +488 @@
                 case BasalFrictionEnum : return "BasalFriction";
                 case ViscousHeatingEnum : return "ViscousHeating";
+                case QmuTemperatureEnum : return "QmuTemperature";
                 default : return "unknown";
 

issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

@@ -53 +53 @@
         IoModelToInputsx(elements,iomodel,iomodel_handle,VzEnum);
         
+        if(iomodel->qmu_analysis)elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum);
+
         /*Free data: */
         xfree((void**)&iomodel->elements);

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -486 +486 @@
         else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
         else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
+        else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
         else _error_("Enum %s not found",name);
 

issm/trunk/src/c/solutions/thermal_core.cpp

@@ -24 +24 @@
         bool control_analysis;
         int solution_type;
+        bool   qmu_analysis         = false;
 
         //first recover parameters common to all solutions
@@ -30 +31 @@
         femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
 
         /*Compute number of time steps: */
@@ -37 +39 @@
         }
         else nsteps=(int)(ndt/dt);
+
+        /*for qmu analysis, reinitialize temperature so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/
+        if(qmu_analysis){
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuTemperatureEnum,TemperatureEnum);
+        }
+
 
         /*Loop through time: */