Changeset 5776


Ignore:
Timestamp:
09/13/10 14:19:35 (15 years ago)
Author:
Mathieu Morlighem
Message:

New Kff Kfs framework

Location:
issm/trunk/src/m
Files:
7 edited

Legend:

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

    r5103 r5776  
    1919   
    2020        %Initialize some fiels with empty celils
    21         femmodel.m_yg=cell(nummodels,1);
    2221        femmodel.m_nodesets=cell(nummodels,1);
    2322        femmodel.m_ys=cell(nummodels,1);
     
    3231                femmodel=SetCurrentConfiguration(femmodel,analysis_type);
    3332
    34                 displaystring(md.verbose,'%s','      generating degrees of freedom...');
     33                displaystring(md.verbose,'%s','      generating vertices degrees of freedom');
    3534                if ~isfield(femmodel,'part'),
    3635                        [femmodel.vertices,femmodel.part,femmodel.tpart]=VerticesDof(femmodel.vertices, femmodel.parameters); %do not create partition vector twice! we only have one set of vertices!
    3736                end
     37
     38                displaystring(md.verbose,'%s','      resolve node constraints');
     39                [femmodel.nodes]=SpcNodes(femmodel.nodes,femmodel.constraints,analysis_type);
     40
     41                displaystring(md.verbose,'%s','      create nodal degrees of freedom');
    3842                [femmodel.nodes]=NodesDof(femmodel.nodes,femmodel.parameters);
    3943
    40                 displaystring(md.verbose,'%s','      generating single point constraints...');
    41                 [femmodel.nodes,femmodel.m_yg{i}]=SpcNodes(femmodel.nodes,femmodel.constraints,analysis_type);
     44                displaystring(md.verbose,'%s','      create nodal constraints vector');
     45                femmodel.m_ys{i}=CreateNodalConstraints(femmodel.nodes,analysis_type);
    4246
    43                 displaystring(md.verbose,'%s','      generating node sets...');
     47                displaystring(md.verbose,'%s','      create node sets');
    4448                femmodel.m_nodesets{i}=BuildNodeSets(femmodel.nodes,analysis_type);
    4549
    46                 displaystring(md.verbose,'%s','      reducing single point constraints vector...');
    47                 femmodel.m_ys{i}=Reducevectorgtos(femmodel.m_yg{i},femmodel.m_nodesets{i});
    48 
    49                 displaystring(md.verbose,'%s','      configuring elements and loads...');
     50                displaystring(md.verbose,'%s','      configuring elements and loads');
    5051                [femmodel.elements,femmodel.loads,femmodel.nodes,femmodel.parameters] = ConfigureObjects( femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices,femmodel.materials,femmodel.parameters);
    5152        end
  • issm/trunk/src/m/solutions/ResetBoundaryConditions.m

    r4520 r5776  
    2020        %For this analysis_type, free existing boundary condition vectors:
    2121        analysis_counter=femmodel.parameters.AnalysisCounter+1; %matlab indexing on counter
    22 
    23         %global dof set
    24         femmodel.m_yg{analysis_counter}=[];
    25         %in the s-set
    2622        femmodel.m_ys{analysis_counter}=[];
    2723
    28         %Now, duplicate ug (the solution vector) into the boundary conditions vector on the g-set
    29         femmodel.m_yg{analysis_counter}=ug;
     24        %Reduce from g to s set
     25        ys=Reducevectorgtos(ug,femmodel.m_nodesets{analysis_counter});
    3026
    31         %Reduce from g to s set
    32         femmodel.m_ys{analysis_counter}=Reducevectorgtos(femmodel.m_yg{analysis_counter},femmodel.m_nodesets{analysis_counter});
     27        %in the s-set
     28        femmodel.m_ys{analysis_counter}=ys;
     29
  • issm/trunk/src/m/solutions/SetCurrentConfiguration.m

    r5377 r5776  
    3939        %activate matrices and vectors:
    4040        femmodel.nodesets=femmodel.m_nodesets{found};
    41         femmodel.yg=femmodel.m_yg{found};
    4241        femmodel.ys=femmodel.m_ys{found};
    4342
  • issm/trunk/src/m/solvers/solver_adjoint_linear.m

    r5693 r5776  
    55%      femmodel =solver_adjoint_linear(femmodel)
    66
    7         [K_gg, p_g, kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
     7        [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
    88       
    99        [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets,femmodel.parameters);
  • issm/trunk/src/m/solvers/solver_diagnostic_nonlinear.m

    r5693 r5776  
    2727                old_uf=uf;
    2828               
    29                 [K_gg, p_g, kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters);
     29                [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters);
    3030               
    3131                [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets,femmodel.parameters);
  • issm/trunk/src/m/solvers/solver_linear.m

    r5693 r5776  
    55%      femmodel =solver_linear(femmodel)
    66
    7         [K_gg, p_g,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
     7        [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
    88       
    99        [K_ff, K_fs] = Reducematrixfromgtof( K_gg,  femmodel.nodesets,femmodel.parameters);
  • issm/trunk/src/m/solvers/solver_thermal_nonlinear.m

    r5707 r5776  
    2020        while(~converged),
    2121
    22                 [K_gg,p_g,melting_offset]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
     22                [K_gg,K_ff,K_fs,p_g,p_f,melting_offset]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
    2323
    2424                [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets,femmodel.parameters);
Note: See TracChangeset for help on using the changeset viewer.