Changeset 4366


Ignore:
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:
11 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/solutions/NewFemModel.m

    r4243 r4366  
    3232           displaystring(md.verbose,'%s%s','   dealing with analysis type: ',EnumAsString(analysis_type));
    3333
    34                 femmodel=SetCurrentAnalysis(femmodel,analysis_type);
     34                femmodel=SetCurrentConfiguration(femmodel,analysis_type);
    3535
    3636           displaystring(md.verbose,'%s','      generating degrees of freedofemmodel...');
  • issm/trunk/src/m/solutions/SetCurrentAnalysis.m

    r4224 r4366  
    1 function femmodel=SetCurrentAnalysis(femmodel,analysis_enum)
    2 %SETCURRENTANALYSIS - set current analysis used to configure elements and nodes in our solutions
     1function femmodel=SetCurrentConfiguration(femmodel,analysis_enum)
     2%SETCURRENTCONFIGURATION- set current analysis used to configure elements and nodes in our solutions
    33%
    44%   Usage:
    5 %      femmodel=SetCurrentAnalysis(femmodel,analysis_type)
     5%      femmodel=SetCurrentConfiguration(femmodel,analysis_type)
    66%
    77%   Ex:
    8 %      femmodel=SetCurrentAnalysis(femmodel,DiagnosticHorizAnalysisEnum)
     8%      femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum)
    99%
    1010
     
    2020
    2121        if found==-1,
    22                 error('SetCurrentAnalysis error message: could not find analysis_type in list of FemModel analyses');
     22                error('SetCurrentConfiguration error message: could not find analysis_type in list of FemModel analyses');
    2323        end
    2424       
  • issm/trunk/src/m/solutions/balancedthickness2_core.m

    r4335 r4366  
    1111
    1212        %Activate formulation
    13         femmodel=SetCurrentAnalysis(femmodel,Balancedthickness2AnalysisEnum);
     13        femmodel=SetCurrentConfiguration(femmodel,Balancedthickness2AnalysisEnum);
    1414
    1515        displaystring(verbose,'\n%s',['depth averaging velocities...']);
  • issm/trunk/src/m/solutions/balancedthickness_core.m

    r4335 r4366  
    1111
    1212        %Activate formulation
    13         femmodel=SetCurrentAnalysis(femmodel,BalancedthicknessAnalysisEnum);
     13        femmodel=SetCurrentConfiguration(femmodel,BalancedthicknessAnalysisEnum);
    1414
    1515        displaystring(verbose,'\n%s',['depth averaging velocities...']);
  • issm/trunk/src/m/solutions/balancedvelocities_core.m

    r4335 r4366  
    1111
    1212        %Activate formulation
    13         femmodel=SetCurrentAnalysis(femmodel,BalancedvelocitiesAnalysisEnum);
     13        femmodel=SetCurrentConfiguration(femmodel,BalancedvelocitiesAnalysisEnum);
    1414
    1515        displaystring(verbose,'\n%s',['depth averaging velocities...']);
  • issm/trunk/src/m/solutions/bedslope_core.m

    r4335 r4366  
    1414
    1515        %Call on core computations:
    16         femmodel=SetCurrentAnalysisAlias(femmodel,BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
     16        femmodel=SetCurrentConfiguration(femmodel,BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
    1717        femmodel=solver_linear(femmodel);
    18         femmodel=SetCurrentAnalysisAlias(femmodel,BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
     18        femmodel=SetCurrentConfiguration(femmodel,BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
    1919        femmodel=solver_linear(femmodel);
    2020       
  • issm/trunk/src/m/solutions/diagnostic_core.m

    r4344 r4366  
    3535
    3636                displaystring(verbose,'\n%s',['computing hutter velocities...']);
    37                 femmodel=SetCurrentAnalysis(femmodel,DiagnosticHutterAnalysisEnum);
     37                femmodel=SetCurrentConfiguration(femmodel,DiagnosticHutterAnalysisEnum);
    3838                femmodel=solver_linear(femmodel);
    3939
     
    4545
    4646                displaystring(verbose,'\n%s',['computing horizontal velocities...']);
    47                 femmodel=SetCurrentAnalysis(femmodel,DiagnosticHorizAnalysisEnum);
     47                femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
    4848                femmodel=solver_diagnostic_nonlinear(femmodel,modify_loads);
    4949        end
     
    5353       
    5454                displaystring(verbose,'\n%s',['computing vertical velocities...']);
    55                 femmodel=SetCurrentAnalysis(femmodel,DiagnosticVertAnalysisEnum);
     55                femmodel=SetCurrentConfiguration(femmodel,DiagnosticVertAnalysisEnum);
    5656                femmodel=solver_linear(femmodel);
    5757
     
    6666
    6767                        displaystring(verbose,'\n%s',['computing stokes velocities and pressure...']);
    68                         femmodel=SetCurrentAnalysis(femmodel,DiagnosticStokesAnalysisEnum);
     68                        femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum);
    6969                        femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads);
    7070                end
  • issm/trunk/src/m/solutions/prognostic2_core.m

    r4335 r4366  
    1010
    1111        %Activate formulation
    12         femmodel=SetCurrentAnalysis(femmodel,Prognostic2AnalysisEnum);
     12        femmodel=SetCurrentConfiguration(femmodel,Prognostic2AnalysisEnum);
    1313
    1414        displaystring(verbose,'\n%s',['depth averaging velocities...']);
  • issm/trunk/src/m/solutions/prognostic_core.m

    r4335 r4366  
    1010
    1111        %Activate formulation
    12         femmodel=SetCurrentAnalysis(femmodel,PrognosticAnalysisEnum);
     12        femmodel=SetCurrentConfiguration(femmodel,PrognosticAnalysisEnum);
    1313
    1414        displaystring(verbose,'\n%s',['depth averaging velocities...']);
  • issm/trunk/src/m/solutions/surfaceslope_core.m

    r4344 r4366  
    1414
    1515        %Call on core computations:
    16         femmodel=SetCurrentAnalysisAlias(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
     16        femmodel=SetCurrentConfiguration(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
    1717        femmodel=solver_linear(femmodel);
    18         femmodel=SetCurrentAnalysisAlias(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
     18        femmodel=SetCurrentConfiguration(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
    1919        femmodel=solver_linear(femmodel);
    2020       
  • issm/trunk/src/m/solutions/thermal_core_step.m

    r4131 r4366  
    99
    1010        displaystring(verbose,'\n%s',['computing temperature...']);
    11         femmodel=SetCurrentAnalysis(femmodel,ThermalAnalysisEnum);
     11        femmodel=SetCurrentConfiguration(femmodel,ThermalAnalysisEnum);
    1212        femmodel=solver_thermal_nonlineat(femmodel);
    1313
    1414        displaystring(verbose,'\n%s',['compute melting...']);
    15         femmodel=SetCurrentAnalysis(femmodel,MeltingAnalysisEnum);
     15        femmodel=SetCurrentConfiguraton(femmodel,MeltingAnalysisEnum);
    1616        femmodel=solver_linear(femmodel);
    1717       
Note: See TracChangeset for help on using the changeset viewer.