Changeset 4366

Timestamp:

06/30/10 15:58:27 (15 years ago)

Author:

seroussi

Message:

moved from CurrentAnalysis to CurrentConfigurationm (serial)

Location:

issm/trunk/src/m/solutions

Files:

• NewFemModel.m (modified) (1 diff)
• SetCurrentAnalysis.m (modified) (2 diffs)
• balancedthickness2_core.m (modified) (1 diff)
• balancedthickness_core.m (modified) (1 diff)
• balancedvelocities_core.m (modified) (1 diff)
• bedslope_core.m (modified) (1 diff)
• diagnostic_core.m (modified) (4 diffs)
• prognostic2_core.m (modified) (1 diff)
• prognostic_core.m (modified) (1 diff)
• surfaceslope_core.m (modified) (1 diff)
• thermal_core_step.m (modified) (1 diff)

issm/trunk/src/m/solutions/NewFemModel.m

@@ -32 +32 @@
            displaystring(md.verbose,'%s%s','   dealing with analysis type: ',EnumAsString(analysis_type));
 
-                femmodel=SetCurrentAnalysis(femmodel,analysis_type);
+                femmodel=SetCurrentConfiguration(femmodel,analysis_type);
 
            displaystring(md.verbose,'%s','      generating degrees of freedofemmodel...');

issm/trunk/src/m/solutions/SetCurrentAnalysis.m

@@ -1 @@
-function femmodel=SetCurrentAnalysis(femmodel,analysis_enum)
-%SETCURRENTANALYSIS - set current analysis used to configure elements and nodes in our solutions
+function femmodel=SetCurrentConfiguration(femmodel,analysis_enum)
+%SETCURRENTCONFIGURATION- set current analysis used to configure elements and nodes in our solutions
 %
 %   Usage:
-%      femmodel=SetCurrentAnalysis(femmodel,analysis_type)
+%      femmodel=SetCurrentConfiguration(femmodel,analysis_type)
 %
 %   Ex:
-%      femmodel=SetCurrentAnalysis(femmodel,DiagnosticHorizAnalysisEnum)
+%      femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum)
 %
 
@@ -20 +20 @@
 
         if found==-1,
-                error('SetCurrentAnalysis error message: could not find analysis_type in list of FemModel analyses');
+                error('SetCurrentConfiguration error message: could not find analysis_type in list of FemModel analyses');
         end
         

issm/trunk/src/m/solutions/balancedthickness2_core.m

@@ -11 +11 @@
 
         %Activate formulation
-        femmodel=SetCurrentAnalysis(femmodel,Balancedthickness2AnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,Balancedthickness2AnalysisEnum);
 
         displaystring(verbose,'\n%s',['depth averaging velocities...']);

issm/trunk/src/m/solutions/balancedthickness_core.m

@@ -11 +11 @@
 
         %Activate formulation
-        femmodel=SetCurrentAnalysis(femmodel,BalancedthicknessAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,BalancedthicknessAnalysisEnum);
 
         displaystring(verbose,'\n%s',['depth averaging velocities...']);

issm/trunk/src/m/solutions/balancedvelocities_core.m

@@ -11 +11 @@
 
         %Activate formulation
-        femmodel=SetCurrentAnalysis(femmodel,BalancedvelocitiesAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,BalancedvelocitiesAnalysisEnum);
 
         displaystring(verbose,'\n%s',['depth averaging velocities...']);

issm/trunk/src/m/solutions/bedslope_core.m

@@ -14 +14 @@
 
         %Call on core computations: 
-        femmodel=SetCurrentAnalysisAlias(femmodel,BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
         femmodel=solver_linear(femmodel);
-        femmodel=SetCurrentAnalysisAlias(femmodel,BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
         femmodel=solver_linear(femmodel);
         

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

@@ -35 +35 @@
 
                 displaystring(verbose,'\n%s',['computing hutter velocities...']);
-                femmodel=SetCurrentAnalysis(femmodel,DiagnosticHutterAnalysisEnum);
+                femmodel=SetCurrentConfiguration(femmodel,DiagnosticHutterAnalysisEnum);
                 femmodel=solver_linear(femmodel);
 
@@ -45 +45 @@
 
                 displaystring(verbose,'\n%s',['computing horizontal velocities...']);
-                femmodel=SetCurrentAnalysis(femmodel,DiagnosticHorizAnalysisEnum);
+                femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
                 femmodel=solver_diagnostic_nonlinear(femmodel,modify_loads); 
         end
@@ -53 +53 @@
         
                 displaystring(verbose,'\n%s',['computing vertical velocities...']);
-                femmodel=SetCurrentAnalysis(femmodel,DiagnosticVertAnalysisEnum);
+                femmodel=SetCurrentConfiguration(femmodel,DiagnosticVertAnalysisEnum);
                 femmodel=solver_linear(femmodel);
 
@@ -66 +66 @@
 
                         displaystring(verbose,'\n%s',['computing stokes velocities and pressure...']);
-                        femmodel=SetCurrentAnalysis(femmodel,DiagnosticStokesAnalysisEnum);
+                        femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum);
                         femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads); 
                 end

issm/trunk/src/m/solutions/prognostic2_core.m

@@ -10 +10 @@
 
         %Activate formulation
-        femmodel=SetCurrentAnalysis(femmodel,Prognostic2AnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,Prognostic2AnalysisEnum);
 
         displaystring(verbose,'\n%s',['depth averaging velocities...']);

issm/trunk/src/m/solutions/prognostic_core.m

@@ -10 +10 @@
 
         %Activate formulation
-        femmodel=SetCurrentAnalysis(femmodel,PrognosticAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,PrognosticAnalysisEnum);
 
         displaystring(verbose,'\n%s',['depth averaging velocities...']);

issm/trunk/src/m/solutions/surfaceslope_core.m

@@ -14 +14 @@
 
         %Call on core computations: 
-        femmodel=SetCurrentAnalysisAlias(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
         femmodel=solver_linear(femmodel);
-        femmodel=SetCurrentAnalysisAlias(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
         femmodel=solver_linear(femmodel);
         

issm/trunk/src/m/solutions/thermal_core_step.m

@@ -9 +9 @@
 
         displaystring(verbose,'\n%s',['computing temperature...']);
-        femmodel=SetCurrentAnalysis(femmodel,ThermalAnalysisEnum);
+        femmodel=SetCurrentConfiguration(femmodel,ThermalAnalysisEnum);
         femmodel=solver_thermal_nonlineat(femmodel);
 
         displaystring(verbose,'\n%s',['compute melting...']);
-        femmodel=SetCurrentAnalysis(femmodel,MeltingAnalysisEnum);
+        femmodel=SetCurrentConfiguraton(femmodel,MeltingAnalysisEnum);
         femmodel=solver_linear(femmodel);