Changeset 1862

Timestamp:

08/25/09 10:00:52 (16 years ago)

Author:

seroussi

Message:

changed thermalstatic to steadystate

Location:

issm/trunk/src/m/classes/public

Files:

• ismodelselfconsistent.m (modified) (3 diffs)
• marshall.m (modified) (1 diff)
• mechanicalproperties.m (modified) (1 diff)
• mesh/meshadaptation.m (modified) (1 diff)
• process_solve_options.m (modified) (1 diff)
• solve.m (modified) (1 diff)
• tres.m (modified) (2 diffs)

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

@@ -231 +231 @@
 end
 
-%THERMALSTATIC
-if md.analysis_type==ThermalstaticAnalysisEnum,
+%steadystate
+if md.analysis_type==steadystateAnalysisEnum,
         %PRESSURE
         if isnans(md.pressure),
-                disp(['For a thermalstatic computation, the model must have an initial pressure, even lithostatic will do.']);
+                disp(['For a steadystate computation, the model must have an initial pressure, even lithostatic will do.']);
                 bool=0;return;
         end
@@ -241 +241 @@
         %eps: 
         if isnan(md.eps_rel),
-                disp(['For a thermalstatic computation, eps_rel (relative convergence criterion) must be defined!']);
+                disp(['For a steadystate computation, eps_rel (relative convergence criterion) must be defined!']);
                 bool=0;return;
         end
@@ -247 +247 @@
         %dim: 
         if strcmpi(md.type,'2d'),
-                disp(['For a thermalstatic computation, model needs to be 3d']);
+                disp(['For a steadystate computation, model needs to be 3d']);
                 bool=0;return;
         end

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

@@ -100 +100 @@
 %Write solution parameters
 WriteData(fid,md.fit,'Mat','fit');
-WriteData(fid,md.thermalstatic,'Integer','thermalstatic');
+WriteData(fid,md.steadystate,'Integer','steadystate');
 WriteData(fid,md.yts,'Scalar','yts');
 WriteData(fid,md.meanvel,'Scalar','meanvel');

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

@@ -106 +106 @@
 strainrate.effectivevalue=1/sqrt(2)*sqrt(strainrate.xx.^2+strainrate.yy.^2+2*strainrate.xy.^2);
 md.strainrate=strainrate;
+
+deviatoricstress=struct('xx',[],'yy',[],'xy',[],'principalvalue1',[],'principalaxis1',[],'principalvalue2',[],'principalaxis2',[],'effectivevalue',[]);
+deviatoricstress.xx=tau_xx;
+deviatoricstress.yy=tau_yy;
+deviatoricstress.xy=tau_xy;
+deviatoricstress.principalvalue2=valuesstress(:,1);
+deviatoricstress.principalaxis2=directionsstress(:,1:2);
+deviatoricstress.principalvalue1=valuesstress(:,2);
+deviatoricstress.principalaxis1=directionsstress(:,3:4);
+deviatoricstress.effectivevalue=1/sqrt(2)*sqrt(stress.xx.^2+stress.yy.^2+2*stress.xy.^2);
+md.deviatoricstress=deviatoricstress;

issm/trunk/src/m/classes/public/mesh/meshadaptation.m

@@ -11 +11 @@
 %
 %   Example:
-%      md2=meshadaptation(md,md.vel,1.2,0.5);
+%      md2=meshadaptation(md,md.vel,1.2,0.5,1);
 
 %some checks

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

@@ -73 +73 @@
 
 %check solution type is supported
-if ~ismemberi(analysis_type,{'control','diagnostic','prognostic','thermal','thermalstatic','parameters','mesh2grid','transient'}),
+if ~ismemberi(analysis_type,{'control','diagnostic','prognostic','thermal','steadystate','parameters','mesh2grid','transient'}),
         error(['process_solve_options error message: analysis_type ' analysis_type ' not supported yet!']);
 else

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

@@ -76 +76 @@
         md=parameters(md);
 
-elseif md.analysis_type==ThermalstaticAnalysisEnum,
-        md=thermalstatic(md);
+elseif md.analysis_type==steadystateAnalysisEnum,
+        md=steadystate(md);
 
 else

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

@@ -1 +1 @@
 function md=tres(md,string)
-%TRANSFERVEL transfer results results to corresponding model fields. 
+%TRES - transfer results results to corresponding model fields. 
 %
 %    Usage: md=tres(md,string)
@@ -16 +16 @@
                 md.riftproperties=md.results.diagnostic.riftproperties;
         end
-elseif strcmpi(string,'thermalstatic'),
-        md.vx=md.results.thermalstatic.vx;
-        md.vy=md.results.thermalstatic.vy;
-        md.vel=md.results.thermalstatic.vel;
-        md.pressure=md.results.thermalstatic.pressure;
-        md.temperature=md.results.thermalstatic.temperature;
-        md.melting=md.results.thermalstatic.melting;
+elseif strcmpi(string,'steadystate'),
+        md.vx=md.results.steadystate.vx;
+        md.vy=md.results.steadystate.vy;
+        md.vel=md.results.steadystate.vel;
+        md.pressure=md.results.steadystate.pressure;
+        md.temperature=md.results.steadystate.temperature;
+        md.melting=md.results.steadystate.melting;
 elseif strcmpi(string,'thermal'),
-        md.temperature=md.results.thermalstatic.temperature;
-        md.melting=md.results.thermalstatic.melting;
+        md.temperature=md.results.steadystate.temperature;
+        md.melting=md.results.steadystate.melting;
 else 
         error(['tres error message: analysis ' string ' not supported yet!']);