Changeset 4573


Ignore:
Timestamp:
07/13/10 18:47:00 (15 years ago)
Author:
Eric.Larour
Message:

Optimized configuration. Only needed in series, or in parallel when resetting
configuration in SetConfiguration in FemModel.
Still more to optimize, but this takes a lot of code away.

Location:
issm/trunk
Files:
71 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/cron/cronfiles/linux_cronfile

    r2092 r4573  
    66
    77#cronjob: issm sunday-friday 9:00pm
    8 0 21 * * * cd /u/wilkes-r1b/morlighe/svn/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_morlighem
     80 21 * * * cd /u/astrid-r1b/larour/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_larour

  • issm/trunk/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp

    r4218 r4573  
    2828        sigma=NewVec((int)numberofelements);
    2929
    30         /*Get elements configured: */
    31         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
    32         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    33         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    34 
    3530        /*Compute basal stress for each element: */
    3631        for (i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/ComputePressurex/ComputePressurex.cpp

    r4218 r4573  
    2626        p_g=NewVec(numberofnodes);
    2727
    28         /*Get elements configured: */
    29         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    30         nodes->Configure(elements,loads, nodes,vertices, materials,parameters);
    31         loads->Configure(elements,loads,nodes,vertices,materials,parameters);
    32         parameters->Configure(elements,loads,nodes,vertices,materials,parameters);
    33 
    3428        /*Compute pressure for each element: */
    3529        for (i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp

    r4218 r4573  
    2727        eps=NewVec(numberofelements);
    2828
    29         /*Get elements configured: */
    30         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
    31         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    32         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    33 
    3429        /*Compute basal stress for each element: */
    3530        for (i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/CostFunctionx/CostFunctionx.cpp

    r4218 r4573  
    2323        double J_sum;
    2424       
    25         /*First, get elements and loads configured: */
    26         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    27         nodes->Configure(elements,loads, nodes,vertices, materials,parameters);
    28         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    29 
    3025        /*Compute surface area: */
    3126        SurfaceAreax(&S,elements,nodes,vertices, loads,materials,parameters);

  • issm/trunk/src/c/modules/Dux/Dux.cpp

    r4218 r4573  
    2929        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    3030
    31         /*First, get elements and loads configured: */
    32         elements->  Configure(elements,loads, nodes, vertices, materials,parameters);
    33         nodes->     Configure(elements,loads, nodes, vertices, materials,parameters);
    34         parameters->Configure(elements,loads, nodes, vertices, materials,parameters);
    35 
    3631        /*Compute surface area: */
    3732        SurfaceAreax(&S,elements,nodes,vertices, loads,materials,parameters);

  • issm/trunk/src/c/modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp

    r4218 r4573  
    2727        connectivity=NewVec(numberofvertices);
    2828        fieldsum    =NewVec(numberofvertices);
    29 
    30         /*First, get elements and nodes configured: */
    31         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    32         nodes->Configure(elements,loads, nodes,vertices, materials,parameters);
    33         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    3429
    3530        /*Serialize field: */

  • issm/trunk/src/c/modules/FieldDepthAveragex/FieldDepthAveragex.cpp

    r4218 r4573  
    1616        double* field_serial=NULL;
    1717        Node*   node=NULL;
    18 
    19         /*First, get elements and nodes configured: */
    20         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    21         nodes->Configure(elements,loads, nodes,vertices, materials,parameters);
    22         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    2318
    2419        /*Serialize field: */

  • issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp

    r4386 r4573  
    2424        parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
    2525
    26         /*First, get elements and loads configured: */
    27         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    28         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    29         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    30         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    31 
    3226        /*Get size of vector: */
    3327        gsize=nodes->NumberOfDofs(configuration_type);

  • issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp

    r4504 r4573  
    1414        int i;
    1515        Vec vector=NULL;
    16 
    17         /*First, get elements and loads configured: */
    18         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    19         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    20         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    21         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    22 
    2316
    2417        if(TypeEnum==VertexEnum){

  • issm/trunk/src/c/modules/Gradjx/Gradjx.cpp

    r4367 r4573  
    1717        Vec gradient=NULL;
    1818       
    19         /*First, get elements and loads configured: */
    20         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
    21         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    22         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    23 
    2419        /*retrieve some parameters: */
    2520        parameters->FindParam(&dim,DimEnum);

  • issm/trunk/src/c/modules/InputAXPYx/InputAXPYx.cpp

    r4218 r4573  
    1414        int      i;
    1515
    16         /*First, get elements and nodes configured: */
    17         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    18 
    1916        /*Go through elemnets, and ask to carry out the AXPY operation on inputs: */
    2017        for(i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/InputControlConstrainx/InputControlConstrainx.cpp

    r4218 r4573  
    1717        if(isnan(cm_min) & isnan(cm_max))return;
    1818
    19         /*First, get elements and nodes configured: */
    20         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    21 
    2219        /*Go through elemnets, and ask to carry out the ControlConstrain operation on inputs: */
    2320        for(i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/InputConvergencex/InputConvergencex.cpp

    r4218 r4573  
    1919        Element*    element=NULL;
    2020        int         verbose=0;
    21 
    22         /*First, configure our datasets: */
    23         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    24         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    25         loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
    26         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    2721
    2822        /*retrieve parameters: */

  • issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.cpp

    r4480 r4573  
    1616        Element* element=NULL;
    1717
    18         /*First, get elements*/
    19         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    20         nodes   ->Configure(elements,loads, nodes,vertices, materials,parameters);
    21 
    2218        /*First depth-average inputs at base of the glacier*/
    2319        for (i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/InputExtrudex/InputExtrudex.cpp

    r4218 r4573  
    1313        int i;
    1414
    15         /*First, get elements*/
    16         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    17 
    1815        /*Then extrude vertically the new inputs*/
    1916        for(i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/InputScalex/InputScalex.cpp

    r4218 r4573  
    1414        int      i;
    1515
    16         /*First, get elements and nodes configured: */
    17         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    18 
    1916        /*Go through elemnets, and ask to reinitialie the input: */
    2017        for(i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/InputToResultx/InputToResultx.cpp

    r4508 r4573  
    1515        Element *element = NULL;
    1616
    17         /*First, get elements and nodes configured: */
    18         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    19 
    2017        /*Go through elemnets, and ask each element to transfer the enum_type input into the results dataset, with step and time information: */
    2118        for(i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp

    r4532 r4573  
    1313        int i;
    1414
    15         /*First, get elements and loads configured: */
    16         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    17         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    18         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    19         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    20        
    2115        /*Elements and loads drive the update: */
    2216        for(i=0;i<elements->Size();i++){
    … …  
    3832       
    3933        int i;
    40 
    41         /*First, get elements and loads configured: */
    42         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    43         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    44         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    45         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    4634
    4735        /*Elements and loads drive the update: */
    … …  
    6553        int i;
    6654
    67         /*First, get elements and loads configured: */
    68         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    69         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    70         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    71         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    72 
    7355        /*Elements and loads drive the update: */
    7456        for(i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp

    r4218 r4573  
    3131        Element* element=NULL;
    3232
    33         /*First, get elements and loads configured: */
    34         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
    35         loads->     Configure(elements,loads, nodes,vertices, materials,parameters);
    36         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    37         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    38        
    3933        /*Elements drive the update: */
    4034        for (i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp

    r4244 r4573  
    2626        int i;
    2727
    28         /*First, get elements and loads configured: */
    29         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    30         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    31         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    32         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    33 
    3428        /*Update elements, nodes, loads and materials from inputs: */
    3529        for(i=0;i<elements->Size();i++){
    … …  
    5448       
    5549        int i;
    56 
    57         /*First, get elements and loads configured: */
    58         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    59         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    60         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    61         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    6250
    6351        /*Update elements, nodes, loads and materials from inputs: */
    … …  
    8472        int i;
    8573
    86         /*First, get elements and loads configured: */
    87         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    88         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    89         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    90         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    91 
    9274        /*Update elements, nodes, loads and materials from inputs: */
    9375        for(i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/MassFluxx/MassFluxx.cpp

    r4218 r4573  
    2323        double all_mass_flux=0;
    2424
    25         /*First, get elements and loads configured: */
    26         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    27         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    28         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    29         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    30 
    3125        /*Go through segments, and then elements, and figure out which elements belong to a segment.
    3226         * When we find one, use the element to compute the mass flux on the segment: */

  • issm/trunk/src/c/modules/MaxAbsVxx/MaxAbsVxx.cpp

    r4218 r4573  
    1717        bool   process_units=true;
    1818        double element_maxabsvx;
    19 
    20         /*First, configure elements:*/
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2219
    2320        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MaxAbsVyx/MaxAbsVyx.cpp

    r4218 r4573  
    1818        double element_maxabsvy;
    1919
    20         /*First, configure elements:*/
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2220
    2321        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MaxAbsVzx/MaxAbsVzx.cpp

    r4218 r4573  
    1717        bool   process_units=true;
    1818        double element_maxabsvz;
    19 
    20         /*First, configure elements:*/
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2219
    2320        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MaxVelx/MaxVelx.cpp

    r4218 r4573  
    1818        bool   process_units=true;
    1919        double element_maxvel;
    20 
    21         /*First, configure elements:*/
    22         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2320
    2421        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MaxVxx/MaxVxx.cpp

    r4218 r4573  
    1717        bool   process_units=true;
    1818        double element_maxvx;
    19 
    20         /*First, configure elements:*/
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2219
    2320        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MaxVyx/MaxVyx.cpp

    r4218 r4573  
    1717        bool   process_units=true;
    1818        double element_maxvy;
    19 
    20         /*First, configure elements:*/
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2219
    2320        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MaxVzx/MaxVzx.cpp

    r4218 r4573  
    1818        bool   process_units=true;
    1919        double element_maxvz;
    20 
    21         /*First, configure elements:*/
    22         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2320
    2421        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MinVelx/MinVelx.cpp

    r4218 r4573  
    1818        bool   process_units=true;
    1919        double element_minvel;
    20 
    21         /*First, configure elements:*/
    22         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2320
    2421        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MinVxx/MinVxx.cpp

    r4218 r4573  
    1717        bool   process_units=true;
    1818        double element_minvx;
    19 
    20         /*First, configure elements:*/
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2219
    2320        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MinVyx/MinVyx.cpp

    r4218 r4573  
    1717        bool   process_units=true;
    1818        double element_minvy;
    19 
    20         /*First, configure elements:*/
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2219
    2320        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/MinVzx/MinVzx.cpp

    r4218 r4573  
    1717        bool   process_units=true;
    1818        double element_minvz;
    19 
    20         /*First, configure elements:*/
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    2219
    2320        /*Go through elements, and request velocity: */

  • issm/trunk/src/c/modules/Misfitx/Misfitx.cpp

    r4218 r4573  
    2323        double J_sum;
    2424       
    25         /*First, get elements and loads configured: */
    26         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    27         nodes->Configure(elements,loads, nodes,vertices, materials,parameters);
    28         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    29 
    3025        /*Compute surface area: */
    3126        SurfaceAreax(&S,elements,nodes,vertices, loads,materials,parameters);

  • issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

    r4321 r4573  
    2424        int  solutiontype;
    2525       
    26         /*First, configure elements*/
    27         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    28         nodes->Configure(elements,loads, nodes,vertices, materials,parameters);
    29         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    30 
    3126        /*Transfer element results into the femmodel->results dataset: */
    3227        ElementResultsToPatch( elements,  nodes,  vertices,  loads, materials, parameters,results);

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

    r4497 r4573  
    2727        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    2828
    29         /*First, get nodes and loads configured: */
    30         elements->Configure(elements, loads, nodes,vertices, materials,parameters);
    31         nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
    32         loads->Configure(elements, loads, nodes,vertices, materials,parameters);
    33 
    3429        /*Do we have penalties linked to rifts? In this case, run our special rifts penalty
    3530         * management routine, otherwise, skip : */

  • issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp

    r4272 r4573  
    1717       
    1818        int analysis_type;
    19 
    20         /*First, get elements and loads configured: */
    21         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
    22         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    23         loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
    24         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    2519
    2620        /*retrive parameters: */

  • issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.cpp

    r4218 r4573  
    2020        double S_sum;
    2121       
    22         /*First, get elements and loads configured: */
    23         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    24         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    25 
    2622        /*Compute gradients: */
    2723        for (i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp

    r4360 r4573  
    2626        int analysis_type;
    2727        int configuration_type;
    28 
    29         /*First, get elements and loads configured: */
    30         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
    31         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    32         loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
    33         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    3428
    3529        /*retrive parameters: */

  • issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.cpp

    r4236 r4573  
    1616        Element* element=NULL;
    1717
    18         /*First, get elements and loads configured: */
    19         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
    20         loads->     Configure(elements,loads, nodes,vertices, materials,parameters);
    21         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    22         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    23 
    2418        /*Elements drive the update: */
    2519        for (i=0;i<elements->Size();i++){

  • issm/trunk/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp

    r4504 r4573  
    1717        double* bed=NULL;
    1818
    19         /*First, get elements and loads configured: */
    20         elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
    21         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
    22         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    23 
    2419        /*get vertex vectors for bed and thickness: */
    2520        GetVectorFromInputsx( &thickness,elements,nodes, vertices, loads, materials, parameters, ThicknessEnum,VertexEnum);

  • issm/trunk/src/c/modules/VecExtrudex/VecExtrudex.cpp

    r4218 r4573  
    1717        Penta*   penta=NULL;
    1818        Node*    node=NULL;
    19 
    20         /*First, get elements and nodes configured: */
    21         elements->Configure(elements,loads, nodes,vertices, materials,parameters);
    22         nodes->Configure(elements,loads, nodes,vertices, materials,parameters);
    23         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
    2419
    2520        /*Serialize vector: */

  • issm/trunk/src/c/objects/FemModel.cpp

    r4422 r4573  
    172172        this->parameters->SetParam(analysis_type,AnalysisTypeEnum);
    173173        this->parameters->SetParam(configuration_type,ConfigurationTypeEnum);
     174
     175        /*configure elements, loads and nodes, for this new analysis: */
     176        this->elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     177        this->nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     178        this->loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     179
    174180}
    175181/*}}}1*/

  • issm/trunk/src/m/solutions/SetCurrentConfiguration.m

    r4372 r4573  
    1515%
    1616
    17 if nargin==3,
    18         analysis_enum=varargin{1};
    19 elseif nargin==2
    20         analysis_enum=configuration_enum;
    21 else
    22         help SetCurrentConfiguration
    23         error('bad usage');
    24 end
     17        if nargin==3,
     18                analysis_enum=varargin{1};
     19        elseif nargin==2
     20                analysis_enum=configuration_enum;
     21        else
     22                help SetCurrentConfiguration
     23                error('bad usage');
     24        end
    2525
    2626        %first, look for analysis:

  • issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.cpp

    r4453 r4573  
    3333        FetchParams(&parameters,PARAMETERS);
    3434
     35        /*configure: */
     36        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     37        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     38        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     39
    3540        /*!Generate internal degree of freedom numbers: */
    3641        ComputeBasalStressx(&sigma_g, elements,nodes,vertices,loads,materials,parameters);

  • issm/trunk/src/mex/ComputePressure/ComputePressure.cpp

    r4453 r4573  
    3333        FetchParams(&parameters,PARAMETERS);
    3434
     35        /*configure: */
     36        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     37        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     38        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     39
    3540        /*!Generate internal degree of freedom numbers: */
    3641        ComputePressurex(&p_g, elements,nodes,vertices,loads,materials,parameters);

  • issm/trunk/src/mex/CostFunction/CostFunction.cpp

    r4453 r4573  
    3232        FetchParams(&parameters,PARAMETERS);
    3333
     34        /*configure: */
     35        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     36        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     37        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     38
    3439        /*!Call core code: */
    3540        CostFunctionx(&J, elements,nodes,vertices, loads,materials,parameters);

  • issm/trunk/src/mex/Du/Du.cpp

    r4453 r4573  
    3232        FetchParams(&parameters,PARAMETERS);
    3333
     34        /*configure: */
     35        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     36        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     37        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     38
    3439        /*!Call core code: */
    3540        Dux(&du_g, elements,nodes,vertices, loads,materials,parameters);

  • issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.cpp

    r4453 r4573  
    3131        FetchData(&field,FIELD);
    3232
     33        /*configure: */
     34        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     35        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     36        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     37
    3338        /*!Call core code: */
    3439        FieldAverageOntoVerticesx(&field,elements,nodes,vertices,loads,materials,parameters);

  • issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.cpp

    r4453 r4573  
    3333        FetchData(&fieldname,FIELDNAME);
    3434
     35        /*configure: */
     36        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     37        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     38        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     39
    3540        /*!Call core code: */
    3641        FieldDepthAveragex(field,elements,nodes,vertices,loads,materials,parameters,fieldname);

  • issm/trunk/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.cpp

    r4453 r4573  
    3232        FetchParams(&parameters,PARAMETERS);
    3333
     34        /*configure: */
     35        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     36        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     37        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     38
    3439        /*!Configure objects:*/
    3540        GetSolutionFromInputsx(&ug,elements, nodes,vertices,loads, materials,parameters);

  • issm/trunk/src/mex/GetVectorFromInputs/GetVectorFromInputs.cpp

    r4534 r4573  
    3636        FetchData(&type_enum,TYPEENUM);
    3737
    38         /*!Configure objects:*/
     38        /*configure: */
     39        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     40        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     41        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     42
     43        /*!core code:*/
    3944        GetVectorFromInputsx(&ug,elements, nodes,vertices,loads, materials,parameters,name_enum,type_enum);
    4045

  • issm/trunk/src/mex/Gradj/Gradj.cpp

    r4453 r4573  
    3535        parameters->FindParam(&control_type,ControlTypeEnum);
    3636
     37        /*configure: */
     38        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     39        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     40        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     41
    3742        /*!Call core code: */
    3843        Gradjx(&grad_g,elements,nodes,vertices,loads,materials,parameters,control_type);

  • issm/trunk/src/mex/InputAXPY/InputAXPY.cpp

    r4536 r4573  
    3535        FetchData(&yenum,YENUM);
    3636
     37        /*configure: */
     38        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     39        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     40        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     41
    3742        /*!Call core code: */
    3843        InputAXPYx( elements, nodes, vertices, loads, materials,parameters,xenum,scalar,yenum);

  • issm/trunk/src/mex/InputControlConstrain/InputControlConstrain.cpp

    r4453 r4573  
    3535FetchData(&cm_max,CMMAX);
    3636
     37/*configure: */
     38elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     39nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     40loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     41
    3742/*call "x" code layer*/
    3843InputControlConstrainx(elements,nodes,vertices,loads, materials,parameters,control_type,cm_min,cm_max);

  • issm/trunk/src/mex/InputConvergence/InputConvergence.cpp

    r4515 r4573  
    5050        criterion_enums=(int*)xmalloc(numcriterions*sizeof(int));
    5151        for(i=0;i<numcriterions;i++)criterion_enums[i]=(int)double_criterion[i];
     52
     53        /*configure: */
     54        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     55        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     56        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     57       
    5258        /*call x code InputConvergencex: */
    5359        converged=InputConvergencex(elements,nodes,vertices,loads,materials,parameters, field_enums,numfields,criterion_enums,criterion_values,numcriterions);

  • issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.cpp

    r4453 r4573  
    3333        FetchData(&average_enum_type,AVERAGEENUMTYPE);
    3434
     35        /*configure: */
     36        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     37        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     38        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     39
    3540        /*call "x" code layer*/
    3641        InputDepthAveragex(elements,nodes,vertices,loads, materials,parameters,enum_type,average_enum_type);

  • issm/trunk/src/mex/InputExtrude/InputExtrude.cpp

    r4453 r4573  
    3131        FetchData(&NameEnum,NAME);
    3232
     33        /*configure: */
     34        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     35        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     36        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     37
    3338        /*!Call core code: */
    3439        InputExtrudex(elements,nodes,vertices,loads,materials,parameters,NameEnum);

  • issm/trunk/src/mex/InputScale/InputScale.cpp

    r4453 r4573  
    3434        FetchData(&scale_factor,SCALEFACTOR);
    3535
     36        /*configure: */
     37        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     38        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     39        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     40
    3641        /*!Call core code: */
    3742        InputScalex( elements, nodes, vertices, loads, materials,parameters,enum_type, scale_factor);

  • issm/trunk/src/mex/InputToResult/InputToResult.cpp

    r4453 r4573  
    3737        FetchData(&enum_type,ENUMTYPE);
    3838
     39        /*configure: */
     40        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     41        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     42        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     43
    3944        if(nrhs==9){
    4045                FetchData(&step,STEP);

  • issm/trunk/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.cpp

    r4453 r4573  
    3333        FetchData(&name,NAME);
    3434
     35        /*configure: */
     36        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     37        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     38        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     39
    3540        /*!Generate internal degree of freedom numbers: */
    3641        InputUpdateFromConstantx(elements,nodes,vertices,loads, materials,parameters,constant,name);

  • issm/trunk/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp

    r4453 r4573  
    3131        FetchData(&solution,SOLUTION);
    3232
     33        /*configure: */
     34        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     35        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     36        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     37
    3338        /*!Generate internal degree of freedom numbers: */
    3439        InputUpdateFromSolutionx(elements,nodes,vertices,loads, materials,parameters,solution);

  • issm/trunk/src/mex/InputUpdateFromVector/InputUpdateFromVector.cpp

    r4453 r4573  
    4141        }
    4242
     43        /*configure: */
     44        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     45        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     46        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     47
    4348        /*!Generate internal degree of freedom numbers: */
    4449        InputUpdateFromVectorx(elements,nodes,vertices,loads, materials,parameters,vector,NameEnum,TypeEnum);

  • issm/trunk/src/mex/MassFlux/MassFlux.cpp

    r4453 r4573  
    3636        parameters->FindParam(&segments,&num_segments,NULL,QmuMassFluxSegmentsEnum);
    3737
     38        /*configure: */
     39        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     40        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     41        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     42
    3843        /*!Compute mass flux along the profile: */
    3944        MassFluxx(&mass_flux, elements,nodes,vertices,loads,materials,parameters,segments,num_segments);

  • issm/trunk/src/mex/Misfit/Misfit.cpp

    r4453 r4573  
    3232        FetchParams(&parameters,PARAMETERS);
    3333
     34        /*configure: */
     35        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     36        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     37        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     38
    3439        /*!Call core code: */
    3540        Misfitx(&J, elements,nodes,vertices,loads,materials,parameters);

  • issm/trunk/src/mex/OutputResults/OutputResults.cpp

    r4453 r4573  
    3737        if(!results)results=new Results(ResultsEnum);
    3838
     39        /*configure: */
     40        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     41        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     42        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     43
    3944        /*Call "x" code layer: */
    4045        OutputResultsx(&dataref, elements,nodes,vertices,loads,materials,parameters,results);

  • issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp

    r4453 r4573  
    3333        FetchParams(&parameters,PARAMETERS);
    3434
     35        /*configure: */
     36        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     37        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     38        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     39
    3540        /*!Generate internal degree of freedom numbers: */
    3641        PenaltyConstraintsx(&converged, &num_unstable_constraints, elements,nodes,vertices, loads,materials,parameters);

  • issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp

    r4453 r4573  
    4141        parameters->FindParam(&pflag,PflagEnum);
    4242
     43        /*configure: */
     44        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     45        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     46        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     47
    4348        /*!Generate stiffnesses from penalties: */
    4449        PenaltySystemMatricesx(Kgg, pg,&kmax,elements,nodes,vertices,loads,materials,parameters,kflag,pflag);

  • issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp

    r4453 r4573  
    3838        parameters->FindParam(&pflag,PflagEnum);
    3939
     40        /*configure: */
     41        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     42        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     43        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     44
    4045        /*!Generate internal degree of freedom numbers: */
    4146        SystemMatricesx(&Kgg, &pg,elements,nodes,vertices,loads,materials,parameters,kflag,pflag);

  • issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.cpp

    r4453 r4573  
    2929FetchParams(&parameters,PARAMETERSIN);
    3030
     31/*configure: */
     32elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     33nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     34loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     35
    3136/*call "x" code layer*/
    3237UpdateGeometryx(elements,nodes,vertices,loads, materials,parameters);

  • issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.cpp

    r4453 r4573  
    2929        FetchParams(&parameters,PARAMETERSIN);
    3030
     31        /*configure: */
     32        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
     33        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
     34        loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
     35
    3136        /*call "x" code layer*/
    3237        UpdateVertexPositionsx(elements,nodes,vertices,loads, materials,parameters);
Note: See TracChangeset for help on using the changeset viewer.