Changeset 1787

Timestamp:

08/20/09 14:24:12 (16 years ago)

Author:

Eric.Larour

Message:

New thermalstatic serial solution! yeeha!
+ new tres routine replaces transfervel (to transfer results)

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.cpp (modified) (1 diff)
• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/Makefile.am (modified) (1 diff)
• c/PenaltyConstraintsx/PenaltyConstraintsx.cpp (modified) (1 diff)
• m/classes/public/ismodelselfconsistent.m (modified) (1 diff)
• m/classes/public/process_solve_options.m (modified) (1 diff)
• m/classes/public/solve.m (modified) (1 diff)
• m/classes/public/transfervel.m (deleted)
• m/classes/public/tres.m (modified) (2 diffs)
• m/enum/AnalysisTypeAsEnum.m (modified) (1 diff)
• m/enum/ThermalstaticAnalysisEnum.m (added)
• m/solutions/cielo/processresults.m (modified) (2 diffs)
• m/solutions/cielo/thermalstatic.m (added)
• m/solutions/cielo/thermalstatic_core.m (added)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp

@@ -33 +33 @@
 int SteadyAnalysisEnum(void){           return          231; }
 int TransientAnalysisEnum(void){        return          232; }
+int ThermalstaticAnalysisEnum(void){    return          233; }
 //slope
 int SlopeComputeAnalysisEnum(void){     return          240; }

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -34 +34 @@
 int SteadyAnalysisEnum(void);
 int TransientAnalysisEnum(void);
+int ThermalstaticAnalysisEnum(void);
 //slope
 int SlopeComputeAnalysisEnum(void);

issm/trunk/src/c/Makefile.am

@@ -604 +604 @@
 bin_PROGRAMS = 
 else 
-dnl bin_PROGRAMS = diagnostic.exe  control.exe thermal.exe prognostic.exe transient.exe
+bin_PROGRAMS = diagnostic.exe  control.exe thermal.exe prognostic.exe transient.exe
 endif
 

issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.cpp

@@ -40 +40 @@
                 /*Do nothing, no constraints management!:*/
                 num_unstable_constraints=0;
+                converged=1;
         }
 

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

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

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','parameters','mesh2grid','transient'}),
+if ~ismemberi(analysis_type,{'control','diagnostic','prognostic','thermal','thermalstatic','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);
+
 else
         error('solution type not supported for this model configuration.');

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

@@ -13 +13 @@
         md.vel=md.results.diagnostic.vel;
         md.pressure=md.results.diagnostic.pressure;
-else if strcmpi(string,'thermalstatic'),
+elseif strcmpi(string,'thermalstatic'),
         md.vx=md.results.thermalstatic.vx;
         md.vy=md.results.thermalstatic.vy;
@@ -20 +20 @@
         md.temperature=md.results.thermalstatic.temperature;
         md.melting=md.results.thermalstatic.melting;
-else if strcmpi(string,'thermal'),
+elseif strcmpi(string,'thermal'),
         md.temperature=md.results.thermalstatic.temperature;
         md.melting=md.results.thermalstatic.melting;

issm/trunk/src/m/enum/AnalysisTypeAsEnum.m

@@ -65 +65 @@
 end
 
+if enum==ThermalstaticAnalysisEnum(),
+        string='thermalstatic';
+end
+
 if enum==SlopeComputeAnalysisEnum(),
         string='slopecompute';

issm/trunk/src/m/solutions/cielo/processresults.m

@@ -15 +15 @@
 
 %recover models first
-if (analysis_type==DiagnosticAnalysisEnum | analysis_type==TransientAnalysisEnum),
+if (analysis_type==DiagnosticAnalysisEnum | analysis_type==TransientAnalysisEnum | analysis_type==ThermalstaticAnalysisEnum()),
         m_dh=models.dh;
         m_ds=models.ds;
@@ -35 +35 @@
         isstokes=m_dh.parameters.isstokes;
 end
-if (analysis_type==ThermalAnalysisEnum() | analysis_type==TransientAnalysisEnum()),
+if (analysis_type==ThermalAnalysisEnum() | analysis_type==TransientAnalysisEnum() | analysis_type==ThermalstaticAnalysisEnum()),
         m_m=models.m;
 end