Changeset 8288


Ignore:
Timestamp:
05/16/11 08:24:11 (14 years ago)
Author:
Mathieu Morlighem
Message:

Moved Balanced* to Balance*

Location:
issm/trunk/src
Files:
5 edited
12 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp

    r8287 r8288  
    11/*
    2  * CreateConstraintsBalancedthickness.c:
     2 * CreateConstraintsBalancethickness.c:
    33 */
    44
    … …  
    1111#include "../ModelProcessorx.h"
    1212
    13 void    CreateConstraintsBalancedthickness(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
     13void    CreateConstraintsBalancethickness(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1414
    1515        /*Intermediary*/
    … …  
    4242
    4343                                        constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,
    44                                                                         *(iomodel->spcthickness+2*i+1),BalancedthicknessAnalysisEnum));//we enforce first translation degree of freedom, for temperature
     44                                                                        *(iomodel->spcthickness+2*i+1),BalancethicknessAnalysisEnum));//we enforce first translation degree of freedom, for temperature
    4545                                        count++;
    4646                                }

  • issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp

    r8287 r8288  
    1 /*! \file CreateLoadsBalancedthickness.c:
     1/*! \file CreateLoadsBalancethickness.c:
    22 */
    33
    … …  
    1111#include "../ModelProcessorx.h"
    1212
    13 void    CreateLoadsBalancedthickness(Loads** ploads, IoModel* iomodel,ConstDataHandle iomodel_handle){
     13void    CreateLoadsBalancethickness(Loads** ploads, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1414
    1515        /*Intermediary*/
    … …  
    4444
    4545                        /* Add load */
    46                         loads->AddObject(new Numericalflux(iomodel->loadcounter+i+1,i,iomodel,BalancedthicknessAnalysisEnum));
     46                        loads->AddObject(new Numericalflux(iomodel->loadcounter+i+1,i,iomodel,BalancethicknessAnalysisEnum));
    4747                }
    4848

  • issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp

    r8287 r8288  
    11/*
    2  * CreateNodesBalancedthickness.c:
     2 * CreateNodesBalancethickness.c:
    33 */
    44
    … …  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesBalancedthickness(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesBalancethickness(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    5555
    5656                                /*Add node to nodes dataset: */
    57                                 nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,BalancedthicknessAnalysisEnum));
     57                                nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,BalancethicknessAnalysisEnum));
    5858
    5959                        }
    … …  
    7777
    7878                                        /*Add node to nodes dataset: */
    79                                         nodes->AddObject(new Node(node_id,node_id-1,vertex_id,io_index,iomodel,BalancedthicknessAnalysisEnum));
     79                                        nodes->AddObject(new Node(node_id,node_id-1,vertex_id,io_index,iomodel,BalancethicknessAnalysisEnum));
    8080
    8181                                }

  • issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp

    r8287 r8288  
    11/*
    2  * UpdateElementsBalancedthickness:
     2 * UpdateElementsBalancethickness:
    33 */
    44
    … …  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    UpdateElementsBalancedthickness(Elements* elements, IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type){
     15void    UpdateElementsBalancethickness(Elements* elements, IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type){
    1616
    1717        /*Intermediary*/

  • issm/trunk/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp

    r8287 r8288  
    3232                        break;
    3333                case BalancethicknessSolutionEnum:
    34                         adjointcore=&adjointbalancedthickness_core;
     34                        adjointcore=&adjointbalancethickness_core;
    3535                        break;
    3636                default:

  • issm/trunk/src/c/solutions/CorePointerFromSolutionEnum.cpp

    r8287 r8288  
    3838                        break;
    3939                case BalancethicknessSolutionEnum:
    40                         solutioncore=&balancedthickness_core;
     40                        solutioncore=&balancethickness_core;
    4141                        break;
    4242                case BalancevelocitiesSolutionEnum:
    43                         solutioncore=&balancedvelocities_core;
     43                        solutioncore=&balancevelocities_core;
    4444                        break;
    4545                case SurfaceSlopeSolutionEnum:

  • issm/trunk/src/c/solutions/adjointbalancethickness_core.cpp

    r8287 r8288  
    1 /*!\file:  adjointbalancedthickness_core.cpp
     1/*!\file:  adjointbalancethickness_core.cpp
    22 * \brief compute inverse method adjoint state
    33 */
    … …  
    1212#include "../solvers/solvers.h"
    1313
    14 void adjointbalancedthickness_core(FemModel* femmodel){
     14void adjointbalancethickness_core(FemModel* femmodel){
    1515       
    1616        /*parameters: */

  • issm/trunk/src/c/solutions/balancethickness_core.cpp

    r8287 r8288  
    1 /*!\file: balancedthickness_core.cpp
    2  * \brief: core of the balancedthickness solution
     1/*!\file: balancethickness_core.cpp
     2 * \brief: core of the balancethickness solution
    33 */
    44
    … …  
    1212#include "../solvers/solvers.h"
    1313
    14 void balancedthickness_core(FemModel* femmodel){
     14void balancethickness_core(FemModel* femmodel){
    1515
    1616        /*parameters: */

  • issm/trunk/src/c/solutions/balancevelocities_core.cpp

    r8287 r8288  
    1 /*!\file: balancedvelocities_core.cpp
    2  * \brief: core of the balancedvelocities solution
     1/*!\file: balancevelocities_core.cpp
     2 * \brief: core of the balancevelocities solution
    33 */
    44
    … …  
    1111#include "../solvers/solvers.h"
    1212
    13 void balancedvelocities_core(FemModel* femmodel){
     13void balancevelocities_core(FemModel* femmodel){
    1414
    1515        /*flags: */

  • issm/trunk/src/c/solutions/solutions.h

    r8279 r8288  
    1414/*cores: */
    1515void adjointdiagnostic_core(FemModel* femmodel);
    16 void adjointbalancedthickness_core(FemModel* femmodel);
     16void adjointbalancethickness_core(FemModel* femmodel);
    1717void gradient_core(FemModel* femmodel,int step=0, double search_scalar=0);
    1818void diagnostic_core(FemModel* femmodel);
    … …  
    2626void controltao_core(FemModel* femmodel);
    2727void prognostic_core(FemModel* femmodel);
    28 void balancedthickness_core(FemModel* femmodel);
    29 void balancedvelocities_core(FemModel* femmodel);
     28void balancethickness_core(FemModel* femmodel);
     29void balancevelocities_core(FemModel* femmodel);
    3030void slopecompute_core(FemModel* femmodel);
    3131void steadystate_core(FemModel* femmodel);
Note: See TracChangeset for help on using the changeset viewer.