Changeset 4254

Timestamp:

Jun 28, 2010, 9:39:47 AM (16 years ago)

Author:

Mathieu Morlighem

Message:

Added Vz As output of diagnostics

Location:

issm/trunk/src/m

Files:

• enum/AbsoluteEnum.m (modified) (1 diff)
• enum/AdjointEnum.m (modified) (1 diff)
• enum/BeamVertexElementResultEnum.m (modified) (1 diff)
• enum/BetaEnum.m (modified) (1 diff)
• enum/BoolExternalResultEnum.m (modified) (1 diff)
• enum/CmGradientEnum.m (modified) (1 diff)
• enum/CmJumpEnum.m (modified) (1 diff)
• enum/CmMaxEnum.m (modified) (1 diff)
• enum/CmMinEnum.m (modified) (1 diff)
• enum/ConnectivityEnum.m (modified) (1 diff)
• enum/ControlParameterEnum.m (modified) (1 diff)
• enum/ControlSteadyEnum.m (modified) (1 diff)
• enum/DakotaParameterEnum.m (modified) (1 diff)
• enum/DimEnum.m (modified) (1 diff)
• enum/DoubleElementResultEnum.m (modified) (1 diff)
• enum/DoubleExternalResultEnum.m (modified) (1 diff)
• enum/DoubleMatExternalResultEnum.m (modified) (1 diff)
• enum/DoubleVecExternalResultEnum.m (modified) (1 diff)
• enum/EnumAsString.m (modified) (2 diffs)
• enum/EpsAbsEnum.m (modified) (1 diff)
• enum/EpsCmEnum.m (modified) (1 diff)
• enum/EpsRelEnum.m (modified) (1 diff)
• enum/EpsResEnum.m (modified) (1 diff)
• enum/ExtrudeParamEnum.m (modified) (1 diff)
• enum/GradientEnum.m (modified) (1 diff)
• enum/HeatCapacityEnum.m (modified) (1 diff)
• enum/IntExternalResultEnum.m (modified) (1 diff)
• enum/IsHutterEnum.m (modified) (1 diff)
• enum/IsMacAyealPattynEnum.m (modified) (1 diff)
• enum/IsStokesEnum.m (modified) (1 diff)
• enum/JEnum.m (modified) (1 diff)
• enum/LatentHeatEnum.m (modified) (1 diff)
• enum/LowmemEnum.m (modified) (1 diff)
• enum/MaxIterEnum.m (modified) (1 diff)
• enum/MaxNonlinearIterationsEnum.m (modified) (1 diff)
• enum/MeltingPointEnum.m (modified) (1 diff)
• enum/MinMechanicalConstraintsEnum.m (modified) (1 diff)
• enum/MinThermalConstraintsEnum.m (modified) (1 diff)
• enum/NStepsEnum.m (modified) (1 diff)
• enum/NdtEnum.m (modified) (1 diff)
• enum/NumOutputEnum.m (modified) (1 diff)
• enum/NumRiftsEnum.m (modified) (1 diff)
• enum/NumberOfDofsPerNodeEnum.m (modified) (1 diff)
• enum/NumberOfElementsEnum.m (modified) (1 diff)
• enum/NumberOfNodesEnum.m (modified) (1 diff)
• enum/NumberOfVerticesEnum.m (modified) (1 diff)
• enum/OldGradientEnum.m (modified) (1 diff)
• enum/OptScalEnum.m (modified) (1 diff)
• enum/OutputFileNameEnum.m (modified) (1 diff)
• enum/P0Enum.m (modified) (1 diff)
• enum/P1Enum.m (modified) (1 diff)
• enum/ParameterOutputEnum.m (modified) (1 diff)
• enum/PatchEnum.m (modified) (1 diff)
• enum/PenaltyMeltingEnum.m (modified) (1 diff)
• enum/PentaVertexElementResultEnum.m (modified) (1 diff)
• enum/PetscVecExternalResultEnum.m (modified) (1 diff)
• enum/QmuAnalysisEnum.m (modified) (1 diff)
• enum/QmuErrNameEnum.m (modified) (1 diff)
• enum/QmuInNameEnum.m (modified) (1 diff)
• enum/QmuMassFluxSegmentsEnum.m (modified) (1 diff)
• enum/QmuNPartEnum.m (modified) (1 diff)
• enum/QmuOutNameEnum.m (modified) (1 diff)
• enum/QmuPartEnum.m (modified) (1 diff)
• enum/QmuVxEnum.m (modified) (1 diff)
• enum/QmuVyEnum.m (modified) (1 diff)
• enum/QmuVzEnum.m (modified) (1 diff)
• enum/RelativeEnum.m (modified) (1 diff)
• enum/ResidualEnum.m (modified) (1 diff)
• enum/ResponseDescriptorsEnum.m (modified) (1 diff)
• enum/SingVertexElementResultEnum.m (modified) (1 diff)
• enum/SolverStringEnum.m (modified) (1 diff)
• enum/SparsityEnum.m (modified) (1 diff)
• enum/StringAsEnum.m (modified) (2 diffs)
• enum/StringExternalResultEnum.m (modified) (1 diff)
• enum/TolXEnum.m (modified) (1 diff)
• enum/TriaVertexElementResultEnum.m (modified) (1 diff)
• enum/VariableDescriptorsEnum.m (modified) (1 diff)
• enum/VerboseEnum.m (modified) (1 diff)
• enum/ViscosityOvershootEnum.m (modified) (1 diff)
• enum/VxAverageEnum.m (modified) (1 diff)
• enum/VxEnum.m (modified) (1 diff)
• enum/VxObsEnum.m (modified) (1 diff)
• enum/VxOldEnum.m (modified) (1 diff)
• enum/VyAverageEnum.m (modified) (1 diff)
• enum/VyEnum.m (modified) (1 diff)
• enum/VyObsEnum.m (modified) (1 diff)
• enum/VyOldEnum.m (modified) (1 diff)
• enum/VzAverageEnum.m (modified) (1 diff)
• enum/VzEnum.m (modified) (1 diff)
• enum/VzObsEnum.m (modified) (1 diff)
• enum/VzOldEnum.m (modified) (1 diff)
• enum/WaitOnLockEnum.m (modified) (1 diff)
• enum/WeightsEnum.m (modified) (1 diff)
• enum/YtsEnum.m (modified) (1 diff)
• solutions/diagnostic_core.m (modified) (1 diff)
• utils/Nightly/runme.m (modified) (2 diffs)
• utils/Nightly/testsgetfields.m (modified) (3 diffs)

issm/trunk/src/m/enum/AbsoluteEnum.m

@@ -9 +9 @@
 %      macro=AbsoluteEnum()
 
-macro=218;
+macro=221;

issm/trunk/src/m/enum/AdjointEnum.m

@@ -9 +9 @@
 %      macro=AdjointEnum()
 
-macro=224;
+macro=227;

issm/trunk/src/m/enum/BeamVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=BeamVertexElementResultEnum()
 
-macro=206;
+macro=208;

issm/trunk/src/m/enum/BetaEnum.m

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=219;
+macro=222;

issm/trunk/src/m/enum/BoolExternalResultEnum.m

@@ -9 +9 @@
 %      macro=BoolExternalResultEnum()
 
-macro=207;
+macro=209;

issm/trunk/src/m/enum/CmGradientEnum.m

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=220;
+macro=223;

issm/trunk/src/m/enum/CmJumpEnum.m

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=221;
+macro=224;

issm/trunk/src/m/enum/CmMaxEnum.m

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=222;
+macro=225;

issm/trunk/src/m/enum/CmMinEnum.m

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=223;
+macro=226;

issm/trunk/src/m/enum/ConnectivityEnum.m

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=227;
+macro=230;

issm/trunk/src/m/enum/ControlParameterEnum.m

@@ -9 +9 @@
 %      macro=ControlParameterEnum()
 
-macro=228;
+macro=231;

issm/trunk/src/m/enum/ControlSteadyEnum.m

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=229;
+macro=232;

issm/trunk/src/m/enum/DakotaParameterEnum.m

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=230;
+macro=233;

issm/trunk/src/m/enum/DimEnum.m

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=231;
+macro=234;

issm/trunk/src/m/enum/DoubleElementResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleElementResultEnum()
 
-macro=202;
+macro=204;

issm/trunk/src/m/enum/DoubleExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleExternalResultEnum()
 
-macro=208;
+macro=210;

issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleMatExternalResultEnum()
 
-macro=210;
+macro=212;

issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m

@@ -9 +9 @@
 %      macro=DoubleVecExternalResultEnum()
 
-macro=209;
+macro=211;

issm/trunk/src/m/enum/EnumAsString.m

@@ -194 +194 @@
         case ThicknessEnum(), string='Thickness'; return
         case TypeEnum(), string='Type'; return
+        case VelEnum(), string='Vel'; return
+        case VelObsEnum(), string='VelObs'; return
         case ViscosityOvershootEnum(), string='ViscosityOvershoot'; return
         case VxAverageEnum(), string='VxAverage'; return
@@ -227 +229 @@
         case JEnum(), string='J'; return
         case PatchEnum(), string='Patch'; return
+        case TimeEnum(), string='Time'; return
         case RelativeEnum(), string='Relative'; return
         case ResidualEnum(), string='Residual'; return

issm/trunk/src/m/enum/EpsAbsEnum.m

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=232;
+macro=235;

issm/trunk/src/m/enum/EpsCmEnum.m

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=233;
+macro=236;

issm/trunk/src/m/enum/EpsRelEnum.m

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=234;
+macro=237;

issm/trunk/src/m/enum/EpsResEnum.m

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=235;
+macro=238;

issm/trunk/src/m/enum/ExtrudeParamEnum.m

@@ -9 +9 @@
 %      macro=ExtrudeParamEnum()
 
-macro=236;
+macro=239;

issm/trunk/src/m/enum/GradientEnum.m

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=225;
+macro=228;

issm/trunk/src/m/enum/HeatCapacityEnum.m

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=237;
+macro=240;

issm/trunk/src/m/enum/IntExternalResultEnum.m

@@ -9 +9 @@
 %      macro=IntExternalResultEnum()
 
-macro=211;
+macro=213;

issm/trunk/src/m/enum/IsHutterEnum.m

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=238;
+macro=241;

issm/trunk/src/m/enum/IsMacAyealPattynEnum.m

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=239;
+macro=242;

issm/trunk/src/m/enum/IsStokesEnum.m

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=240;
+macro=243;

issm/trunk/src/m/enum/JEnum.m

@@ -9 +9 @@
 %      macro=JEnum()
 
-macro=214;
+macro=216;

issm/trunk/src/m/enum/LatentHeatEnum.m

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=241;
+macro=244;

issm/trunk/src/m/enum/LowmemEnum.m

@@ -9 +9 @@
 %      macro=LowmemEnum()
 
-macro=242;
+macro=245;

issm/trunk/src/m/enum/MaxIterEnum.m

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=243;
+macro=246;

issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=244;
+macro=247;

issm/trunk/src/m/enum/MeltingPointEnum.m

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=245;
+macro=248;

issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=246;
+macro=249;

issm/trunk/src/m/enum/MinThermalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=247;
+macro=250;

issm/trunk/src/m/enum/NStepsEnum.m

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=248;
+macro=251;

issm/trunk/src/m/enum/NdtEnum.m

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=249;
+macro=252;

issm/trunk/src/m/enum/NumOutputEnum.m

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=250;
+macro=253;

issm/trunk/src/m/enum/NumRiftsEnum.m

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=251;
+macro=254;

issm/trunk/src/m/enum/NumberOfDofsPerNodeEnum.m

@@ -9 +9 @@
 %      macro=NumberOfDofsPerNodeEnum()
 
-macro=252;
+macro=255;

issm/trunk/src/m/enum/NumberOfElementsEnum.m

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=253;
+macro=256;

issm/trunk/src/m/enum/NumberOfNodesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=254;
+macro=257;

issm/trunk/src/m/enum/NumberOfVerticesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=255;
+macro=258;

issm/trunk/src/m/enum/OldGradientEnum.m

@@ -9 +9 @@
 %      macro=OldGradientEnum()
 
-macro=226;
+macro=229;

issm/trunk/src/m/enum/OptScalEnum.m

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=256;
+macro=259;

issm/trunk/src/m/enum/OutputFileNameEnum.m

@@ -9 +9 @@
 %      macro=OutputFileNameEnum()
 
-macro=257;
+macro=260;

issm/trunk/src/m/enum/P0Enum.m

@@ -9 +9 @@
 %      macro=P0Enum()
 
-macro=200;
+macro=202;

issm/trunk/src/m/enum/P1Enum.m

@@ -9 +9 @@
 %      macro=P1Enum()
 
-macro=201;
+macro=203;

issm/trunk/src/m/enum/ParameterOutputEnum.m

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=258;
+macro=261;

issm/trunk/src/m/enum/PatchEnum.m

@@ -9 +9 @@
 %      macro=PatchEnum()
 
-macro=215;
+macro=217;

issm/trunk/src/m/enum/PenaltyMeltingEnum.m

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=259;
+macro=262;

issm/trunk/src/m/enum/PentaVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=PentaVertexElementResultEnum()
 
-macro=204;
+macro=206;

issm/trunk/src/m/enum/PetscVecExternalResultEnum.m

@@ -9 +9 @@
 %      macro=PetscVecExternalResultEnum()
 
-macro=212;
+macro=214;

issm/trunk/src/m/enum/QmuAnalysisEnum.m

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=260;
+macro=263;

issm/trunk/src/m/enum/QmuErrNameEnum.m

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=261;
+macro=264;

issm/trunk/src/m/enum/QmuInNameEnum.m

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=262;
+macro=265;

issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=263;
+macro=266;

issm/trunk/src/m/enum/QmuNPartEnum.m

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=264;
+macro=267;

issm/trunk/src/m/enum/QmuOutNameEnum.m

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=265;
+macro=268;

issm/trunk/src/m/enum/QmuPartEnum.m

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=266;
+macro=269;

issm/trunk/src/m/enum/QmuVxEnum.m

@@ -9 +9 @@
 %      macro=QmuVxEnum()
 
-macro=188;
+macro=190;

issm/trunk/src/m/enum/QmuVyEnum.m

@@ -9 +9 @@
 %      macro=QmuVyEnum()
 
-macro=193;
+macro=195;

issm/trunk/src/m/enum/QmuVzEnum.m

@@ -9 +9 @@
 %      macro=QmuVzEnum()
 
-macro=198;
+macro=200;

issm/trunk/src/m/enum/RelativeEnum.m

@@ -9 +9 @@
 %      macro=RelativeEnum()
 
-macro=216;
+macro=219;

issm/trunk/src/m/enum/ResidualEnum.m

@@ -9 +9 @@
 %      macro=ResidualEnum()
 
-macro=217;
+macro=220;

issm/trunk/src/m/enum/ResponseDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=267;
+macro=270;

issm/trunk/src/m/enum/SingVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=SingVertexElementResultEnum()
 
-macro=205;
+macro=207;

issm/trunk/src/m/enum/SolverStringEnum.m

@@ -9 +9 @@
 %      macro=SolverStringEnum()
 
-macro=268;
+macro=271;

issm/trunk/src/m/enum/SparsityEnum.m

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=269;
+macro=272;

issm/trunk/src/m/enum/StringAsEnum.m

@@ -192 +192 @@
 elseif (strcmpi(name,'Thickness')), enum=ThicknessEnum(); return
 elseif (strcmpi(name,'Type')), enum=TypeEnum(); return
+elseif (strcmpi(name,'Vel')), enum=VelEnum(); return
+elseif (strcmpi(name,'VelObs')), enum=VelObsEnum(); return
 elseif (strcmpi(name,'ViscosityOvershoot')), enum=ViscosityOvershootEnum(); return
 elseif (strcmpi(name,'VxAverage')), enum=VxAverageEnum(); return
@@ -225 +227 @@
 elseif (strcmpi(name,'J')), enum=JEnum(); return
 elseif (strcmpi(name,'Patch')), enum=PatchEnum(); return
+elseif (strcmpi(name,'Time')), enum=TimeEnum(); return
 elseif (strcmpi(name,'Relative')), enum=RelativeEnum(); return
 elseif (strcmpi(name,'Residual')), enum=ResidualEnum(); return

issm/trunk/src/m/enum/StringExternalResultEnum.m

@@ -9 +9 @@
 %      macro=StringExternalResultEnum()
 
-macro=213;
+macro=215;

issm/trunk/src/m/enum/TolXEnum.m

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=270;
+macro=273;

issm/trunk/src/m/enum/TriaVertexElementResultEnum.m

@@ -9 +9 @@
 %      macro=TriaVertexElementResultEnum()
 
-macro=203;
+macro=205;

issm/trunk/src/m/enum/VariableDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=271;
+macro=274;

issm/trunk/src/m/enum/VerboseEnum.m

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=272;
+macro=275;

issm/trunk/src/m/enum/ViscosityOvershootEnum.m

@@ -9 +9 @@
 %      macro=ViscosityOvershootEnum()
 
-macro=183;
+macro=185;

issm/trunk/src/m/enum/VxAverageEnum.m

@@ -9 +9 @@
 %      macro=VxAverageEnum()
 
-macro=184;
+macro=186;

issm/trunk/src/m/enum/VxEnum.m

@@ -9 +9 @@
 %      macro=VxEnum()
 
-macro=185;
+macro=187;

issm/trunk/src/m/enum/VxObsEnum.m

@@ -9 +9 @@
 %      macro=VxObsEnum()
 
-macro=186;
+macro=188;

issm/trunk/src/m/enum/VxOldEnum.m

@@ -9 +9 @@
 %      macro=VxOldEnum()
 
-macro=187;
+macro=189;

issm/trunk/src/m/enum/VyAverageEnum.m

@@ -9 +9 @@
 %      macro=VyAverageEnum()
 
-macro=189;
+macro=191;

issm/trunk/src/m/enum/VyEnum.m

@@ -9 +9 @@
 %      macro=VyEnum()
 
-macro=190;
+macro=192;

issm/trunk/src/m/enum/VyObsEnum.m

@@ -9 +9 @@
 %      macro=VyObsEnum()
 
-macro=191;
+macro=193;

issm/trunk/src/m/enum/VyOldEnum.m

@@ -9 +9 @@
 %      macro=VyOldEnum()
 
-macro=192;
+macro=194;

issm/trunk/src/m/enum/VzAverageEnum.m

@@ -9 +9 @@
 %      macro=VzAverageEnum()
 
-macro=194;
+macro=196;

issm/trunk/src/m/enum/VzEnum.m

@@ -9 +9 @@
 %      macro=VzEnum()
 
-macro=195;
+macro=197;

issm/trunk/src/m/enum/VzObsEnum.m

@@ -9 +9 @@
 %      macro=VzObsEnum()
 
-macro=196;
+macro=198;

issm/trunk/src/m/enum/VzOldEnum.m

@@ -9 +9 @@
 %      macro=VzOldEnum()
 
-macro=197;
+macro=199;

issm/trunk/src/m/enum/WaitOnLockEnum.m

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=273;
+macro=276;

issm/trunk/src/m/enum/WeightsEnum.m

@@ -9 +9 @@
 %      macro=WeightsEnum()
 
-macro=199;
+macro=201;

issm/trunk/src/m/enum/YtsEnum.m

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=274;
+macro=277;

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

@@ -73 +73 @@
         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum);
         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VyEnum);
+        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VelEnum);
         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,PressureEnum);
-        if(dim==3) femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum); end
+        if(dim==3) femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VzEnum); end

issm/trunk/src/m/utils/Nightly/runme.m

@@ -185 +185 @@
                         for k=1:length(fields),
                                 field=fields{k};
-                                eval([ archive_name '_field' num2str(k) ' = md.results. ' field  ';']);
+                                eval([ archive_name '_field' num2str(k) ' = ' field  ';']);
                         end
                         eval(['save ' archive_name ' ' archive_name '_field*']);
@@ -204 +204 @@
                                 %compare to archive
                                 eval(['Archive=' archive_name '_field' num2str(k) ';']);
-                                eval(['error_diff=full(max(abs(Archive-md.results.' field '))/(max(abs(Archive))+eps));']);
+                                eval(['error_diff=full(max(abs(Archive-' field '))/(max(abs(Archive))+eps));']);
 
                                 %disp test result

issm/trunk/src/m/utils/Nightly/testsgetfields.m

@@ -1 @@
-function fields=testsgetfields(md,sequence),
+function [field_names field_values]=testsgetfields(md,sequence),
 %TESTSGETFIELDS - build the fields to be checked from a analysis
 %
@@ -9 +9 @@
 %
 %   Example:
-%      fields=testsgetfields(md,'DiagnosticAnalysis')
+%      fields=testsgetfields(md,'DiagnosticSolution')
 %
 %   See also: TESTSGETANALYSIS, TESTGETPACKAGE
@@ -21 +21 @@
 parallel=sequence{6};
 
-if (analysis_type==DiagnosticAnalysisEnum),
+if (analysis_type==DiagnosticSolutionEnum),
         if control,
-                fields={'DiagnosticAnalysis.vel','DiagnosticAnalysis.J','DiagnosticAnalysis.parameter'};
+                fields={,'DiagnosticAnalysis.Vel.value','DiagnosticAnalysis.J.value','DiagnosticAnalysis.parameter.value'};
         elseif qmu,
                 fields={'dakota.importancefactors'};
         else
                 if md.dim==3
-                        fields={'DiagnosticAnalysis.vy','DiagnosticAnalysis.vz'};
+                        fields={'DiagnosticAnalysis.Vy.value','DiagnosticAnalysis.Vz.value'};
                 else
-                        fields={'DiagnosticAnalysis.vel'};
+                        field_names={'Vel'};
+                        vx=zeros(md.numberofgrids,1);
+                        vx(md.results.DiagnosticAnalysis.Vx.index)=md.results.DiagnosticAnalysis.Vx.value;
+                        vy=zeros(md.numberofgrids,1);
+                        vy(md.results.DiagnosticAnalysis.Vy.index)=md.results.DiagnosticAnalysis.Vy.value;
+                        vel=sqrt(vx.^2+vy.^2);
+                        field_values={vel};
                 end
         end
+        md.results.DiagnosticAnalysis.Vx.value
 
-elseif (analysis_type==ThermalAnalysisEnum),
-        fields={'ThermalAnalysis(end).temperature','ThermalAnalysis(end).melting'};
+elseif (analysis_type==ThermalSolutionEnum),
+        fields={'ThermalSolution(end).temperature','ThermalSolution(end).melting'};
 
-elseif (analysis_type==PrognosticAnalysisEnum),
-        fields={'PrognosticAnalysis.thickness'};
+elseif (analysis_type==PrognosticSolutionEnum),
+        fields={'PrognosticSolution.thickness'};
 
-elseif (analysis_type==Prognostic2AnalysisEnum),
-        fields={'Prognostic2Analysis.thickness'};
+elseif (analysis_type==Prognostic2SolutionEnum),
+        fields={'Prognostic2Solution.thickness'};
 
-elseif (analysis_type==TransientAnalysisEnum), 
+elseif (analysis_type==TransientSolutionEnum), 
         if md.dim==3
-                fields={'TransientAnalysis(end).vel','TransientAnalysis(end).pressure','TransientAnalysis(end).temperature','TransientAnalysis(end).melting','TransientAnalysis(end).thickness','TransientAnalysis(end).surface','TransientAnalysis(end).bed'};
+                fields={'TransientSolution(end).vel','TransientSolution(end).pressure','TransientSolution(end).temperature','TransientSolution(end).melting','TransientSolution(end).thickness','TransientSolution(end).surface','TransientSolution(end).bed'};
         else
-                fields={'TransientAnalysis(end).vel','TransientAnalysis(end).thickness','TransientAnalysis(end).surface','TransientAnalysis(end).bed'};
+                fields={'TransientSolution(end).vel','TransientSolution(end).thickness','TransientSolution(end).surface','TransientSolution(end).bed'};
         end
 
-elseif (analysis_type==SteadystateAnalysisEnum), 
+elseif (analysis_type==SteadystateSolutionEnum), 
         if control,
-                fields={'SteadystateAnalysis.vel','SteadystateAnalysis.J','SteadystateAnalysis.parameter'};
+                fields={'SteadystateSolution.vel','SteadystateSolution.J','SteadystateSolution.parameter'};
         else
-                fields={'SteadystateAnalysis.vel','SteadystateAnalysis.pressure','SteadystateAnalysis.temperature'};
+                fields={'SteadystateSolution.vel','SteadystateSolution.pressure','SteadystateSolution.temperature'};
         end
 
-elseif (analysis_type==BalancedthicknessAnalysisEnum), 
-        fields={'BalancedthicknessAnalysis.thickness'};
+elseif (analysis_type==BalancedthicknessSolutionEnum), 
+        fields={'BalancedthicknessSolution.thickness'};
 
-elseif (analysis_type==SlopecomputeAnalysisEnum), 
-        fields={'SlopecomputeAnalysis.slopex','SlopecomputeAnalysis.slopey'};
+elseif (analysis_type==SlopecomputeSolutionEnum), 
+        fields={'SlopecomputeSolution.slopex','SlopecomputeSolution.slopey'};
 
 else