Changeset 10650

Timestamp:

11/15/11 11:47:23 (13 years ago)

Author:

schlegel

Message:

Add transient check for Qmu parameters

Location:

issm/trunk/src/c/solutions

Files:

• diagnostic_core.cpp (modified) (1 diff)
• transient_core.cpp (modified) (3 diffs)

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

@@ -40 +40 @@
 
         /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/
-        if(dakota_analysis){
+        if(dakota_analysis && solution_type==DiagnosticSolutionEnum){
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVxEnum,VxEnum);
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVyEnum,VyEnum);

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

@@ -25 +25 @@
         double finaltime,dt,yts;
         bool   control_analysis,isdiagnostic,isprognostic,isthermal,isgroundingline;
+        bool   dakota_analysis=false;
         bool   time_adapt=false;
         int    solution_type;
@@ -42 +43 @@
         femmodel->parameters->FindParam(&yts,ConstantsYtsEnum);
         femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum);
+        femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
         femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
@@ -56 +58 @@
         step=0;
         time=0;
+
+        /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/
+        if(dakota_analysis){
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVxEnum,VxEnum);
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVyEnum,VyEnum);
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVzEnum,VzEnum);
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuPressureEnum,PressureEnum);
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuThicknessEnum,ThicknessEnum);
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuSurfaceEnum,SurfaceEnum);
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuBedEnum,BedEnum);
+                if(isthermal && dim==3){
+                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuTemperatureEnum,TemperatureEnum);
+                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuMeltingEnum,BasalforcingsMeltingRateEnum);
+                }
+        }
 
         while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime.