Changeset 4303

Timestamp:

06/29/10 08:49:53 (15 years ago)

Author:

seroussi

Message:

wrong analysis_type in ismodelselfconsistent

File:

• issm/trunk/src/m/classes/public/ismodelselfconsistent.m (modified) (11 diffs)

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -17 +17 @@
 
 %check analysis
-if (md.analysis_type==Transient2DAnalysisEnum | md.analysis_type==Transient3DAnalysisEnum),
+if (md.analysis_type==Transient2DSolutionEnum | md.analysis_type==Transient3DSolutionEnum),
         if md.dt<=0,
                 error('model not consistent: field dt must be positive for a transient run')
@@ -24 +24 @@
         %recursive call to ismodelselfconsistent
         if (md.dim==2),
-                analysis=[DiagnosticAnalysisEnum PrognosticAnalysisEnum];
+                analysis=[DiagnosticSolutionEnum PrognosticSolutionEnum];
         else
-                analysis=[DiagnosticAnalysisEnum PrognosticAnalysisEnum ThermalAnalysisEnum];
+                analysis=[DiagnosticSolutionEnum PrognosticSolutionEnum ThermalSolutionEnum];
         end
 
@@ -66 +66 @@
         error(['model not consistent: no elements type set for this model. at least one of ismacayealpattyn, ishutter and isstokes need to be =1']);
 end
-if (md.analysis_type==DiagnosticAnalysisEnum & any(ismember(MacAyealFormulationEnum,md.elements_type(:,1)) & ismember(PattynFormulationEnum,md.elements_type(:,1))))
+if (md.analysis_type==DiagnosticSolutionEnum & any(ismember(MacAyealFormulationEnum,md.elements_type(:,1)) & ismember(PattynFormulationEnum,md.elements_type(:,1))))
         error(['model not consistent: coupling MacAyeal/Pattyn not implemented yet']);
 end
-if (md.isstokes & md.analysis_type==Transient3DAnalysisEnum());
+if (md.isstokes & md.analysis_type==Transient3DSolutionEnum());
         error(['model not consistent: Stokes transient not implemented yet']);
 end
@@ -221 +221 @@
 
 %DIAGNOSTIC
-if md.analysis_type==DiagnosticAnalysisEnum,
+if md.analysis_type==DiagnosticSolutionEnum,
 
         %CHECK THAT WE ARE NOT FULLY CONSTRAINED
@@ -256 +256 @@
 
 %PROGNOSTIC
-if md.analysis_type==PrognosticAnalysisEnum,
+if md.analysis_type==PrognosticSolutionEnum,
 
         %INITIAL VELOCITIES
@@ -273 +273 @@
 
 %STEADYSTATE
-if md.analysis_type==SteadystateAnalysisEnum,
+if md.analysis_type==SteadystateSolutionEnum,
 
         %NDT
@@ -297 +297 @@
 
 %THERMAL STEADY AND THERMAL TRANSIENT
-if md.analysis_type==ThermalAnalysisEnum,
+if md.analysis_type==ThermalSolutionEnum,
 
         %EXTRUSION
@@ -317 +317 @@
 
 %THERMAL TRANSIENT
-if md.analysis_type==ThermalAnalysisEnum & md.dt~=0,
+if md.analysis_type==ThermalSolutionEnum & md.dt~=0,
 
         %DT and NDT
@@ -335 +335 @@
 
 %BALANCEDTHICKNESS
-if md.analysis_type==BalancedthicknessAnalysisEnum
+if md.analysis_type==BalancedthicknessSolutionEnum
 
         %VELOCITIES MELTING AND ACCUMULATION
@@ -349 +349 @@
 
 %BALANCEDTHICKNESS2
-if md.analysis_type==Balancedthickness2AnalysisEnum
+if md.analysis_type==Balancedthickness2SolutionEnum
 
         %VELOCITIES MELTING AND ACCUMULATION
@@ -363 +363 @@
 
 %BALANCEDVELOCITIES
-if md.analysis_type==BalancedvelocitiesAnalysisEnum
+if md.analysis_type==BalancedvelocitiesSolutionEnum
 
         %VELOCITIES MELTING AND ACCUMULATION