Changeset 10649

Timestamp:

11/15/11 11:46:04 (13 years ago)

Author:

schlegel

Message:

Save Qmu variables for transient run

Location:

issm/trunk/src/m/solutions

Files:

• diagnostic_core.m (modified) (1 diff)
• transient_core.m (modified) (2 diffs)

issm/trunk/src/m/solutions/diagnostic_core.m

@@ -20 +20 @@
 
         %for qmu analysis, be sure the velocity input we are starting from  is the one in the parameters: 
-        if dakota_analysis,
+        if dakota_analysis & solution_type==DiagnosticSolutionEnum,
                 femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuVxEnum,VxEnum);
                 femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuVyEnum,VyEnum);

issm/trunk/src/m/solutions/transient_core.m

@@ -14 +14 @@
         output_frequency=femmodel.parameters.SettingsOutputFrequency;
         time_adapt=femmodel.parameters.TimesteppingTimeAdapt;
+        dakota_analysis=femmodel.parameters.QmuIsdakota;
         isdiagnostic=femmodel.parameters.TransientIsdiagnostic;
         isprognostic=femmodel.parameters.TransientIsprognostic;
@@ -23 +24 @@
         time=0;
         step=0;
+
+        %for qmu analysis, be sure the velocity input we are starting from  is the one in the parameters: 
+        if dakota_analysis,
+                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuVxEnum,VxEnum);
+                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuVyEnum,VyEnum);
+                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuVzEnum,VzEnum);
+                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuPressureEnum,PressureEnum);
+                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuBedEnum,BedEnum);
+                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuThicknessEnum,ThicknessEnum);      
+                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuSurfaceEnum,SurfaceEnum);
+                if (isthermal & dim==3)
+                        femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuTemperatureEnum,TemperatureEnum);
+                        femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuMeltingEnum,BasalforcingsMeltingRateEnum);
+                end
+        end
 
         %Loop through time