Changeset 17322


Ignore:
Timestamp:
02/20/14 12:06:02 (11 years ago)
Author:
seroussi
Message:

CHG: changed name of ResetCoordinateSystemx to include FS boundary condition

Location:
issm/trunk-jpl/src/c
Files:
9 edited
3 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r17305 r17322  
    320320                                        ./modules/ResetConstraintsx/ResetConstraintsx.h\
    321321                                        ./modules/ResetConstraintsx/ResetConstraintsx.cpp\
    322                                         ./modules/ResetCoordinateSystemx/ResetCoordinateSystemx.h\
    323                                         ./modules/ResetCoordinateSystemx/ResetCoordinateSystemx.cpp\
     322                                        ./modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h\
     323                                        ./modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.cpp\
    324324                                        ./modules/Solverx/Solverx.cpp\
    325325                                        ./modules/Solverx/Solverx.h\

  • issm/trunk-jpl/src/c/classes/Elements/Element.h

    r17309 r17322  
    216216                virtual Element*   SpawnTopElement(void)=0;
    217217                virtual void   ReduceMatrices(ElementMatrix* Ke,ElementVector* pe)=0;
    218                 virtual void   ResetCoordinateSystem()=0;
     218                virtual void   ResetFSBasalBoundaryCondition()=0;
    219219                virtual void   SetTemporaryElementType(int element_type_in)=0;
    220220                virtual IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa)=0;

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r17309 r17322  
    21582158}
    21592159/*}}}*/
    2160 /*FUNCTION Penta::ResetCoordinateSystem{{{*/
    2161 void  Penta::ResetCoordinateSystem(void){
     2160/*FUNCTION Penta::ResetFSBasalBoundaryCondition{{{*/
     2161void  Penta::ResetFSBasalBoundaryCondition(void){
    21622162
    21632163        int        approximation;

  • issm/trunk-jpl/src/c/classes/Elements/Penta.h

    r17309 r17322  
    117117                void   PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm);
    118118                void   ReduceMatrices(ElementMatrix* Ke,ElementVector* pe);
    119                 void   ResetCoordinateSystem(void);
     119                void   ResetFSBasalBoundaryCondition(void);
    120120                void   SmbGradients();
    121121                void   SetTemporaryElementType(int element_type_in);

  • issm/trunk-jpl/src/c/classes/Elements/Seg.h

    r17315 r17322  
    169169                int         NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){_error_("not implemented yet");};
    170170                void        PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){_error_("not implemented yet");};
    171                 void        ResetCoordinateSystem(void){_error_("not implemented yet");};
     171                void        ResetFSBasalBoundaryCondition(void){_error_("not implemented yet");};
    172172                void        ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){_error_("not implemented yet");};
    173173                void        SetTemporaryElementType(int element_type_in){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r17321 r17322  
    19361936}
    19371937/*}}}*/
    1938 /*FUNCTION Tria::ResetCoordinateSystem{{{*/
    1939 void  Tria::ResetCoordinateSystem(void){
     1938/*FUNCTION Tria::ResetFSBasalBoundaryCondition{{{*/
     1939void  Tria::ResetFSBasalBoundaryCondition(void){
    19401940
    19411941        int        approximation;

  • issm/trunk-jpl/src/c/classes/Elements/Tria.h

    r17309 r17322  
    113113                void        PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm);
    114114                void        ReduceMatrices(ElementMatrix* Ke,ElementVector* pe);
    115                 void        ResetCoordinateSystem(void);
     115                void        ResetFSBasalBoundaryCondition(void);
    116116                void          SmbGradients();
    117117           Element*    SpawnBasalElement(void);

  • issm/trunk-jpl/src/c/cores/stressbalance_core.cpp

    r17279 r17322  
    4949                bedslope_core(femmodel);
    5050                femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
    51                 ResetCoordinateSystemx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
     51                ResetFSBasalBoundaryConditionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    5252        }
    5353

  • issm/trunk-jpl/src/c/modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.cpp

    r17321 r17322  
    1 /*!\file ResetCoordinateSystemx
     1/*!\file ResetFSBasalBoundaryConditionx
    22 * \brief: reset coordinate system for full-FS: tangential to the bedrock
    33 */
    44
    5 #include "./ResetCoordinateSystemx.h"
     5#include "./ResetFSBasalBoundaryConditionx.h"
    66#include "../../shared/shared.h"
    77#include "../../toolkits/toolkits.h"
    88
    9 void ResetCoordinateSystemx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,Parameters* parameters){
     9void ResetFSBasalBoundaryConditionx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,Parameters* parameters){
    1010
    1111        Element *element = NULL;
    … …  
    1313        for (int i=0;i<elements->Size();i++){
    1414                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
    15                 element->ResetCoordinateSystem();
     15                element->ResetFSBasalBoundaryCondition();
    1616        }
    1717

  • issm/trunk-jpl/src/c/modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h

    r17321 r17322  
    1 /*!\file:  ResetCoordinateSystemx.h
     1/*!\file:  ResetFSBasalBoundaryConditionx.h
    22 * \brief header file for reset coordinate system module
    33 */
    44
    5 #ifndef _RESETCOORDINATESYSTEMX_H
    6 #define _RESETCOORDINATESYSTEMX_H
     5#ifndef _RESETFSBASALBOUNDARYCONDITIONX_H
     6#define _RESETFSBASALBOUNDARYCONDITIONX_H
    77
    88#include "../../classes/classes.h"
    99
    1010/* local prototypes: */
    11 void ResetCoordinateSystemx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,  Parameters* parameters);
     11void ResetFSBasalBoundaryConditionx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,  Parameters* parameters);
    1212
    13 #endif  /* _RESETCOORDINATESYSTEMX_H */
     13#endif  /* _RESETFSBASALBOUNDARYCONDITIONX_H */

  • issm/trunk-jpl/src/c/modules/modules.h

    r17241 r17322  
    8080#include "./Reducevectorgtofx/Reducevectorgtofx.h"
    8181#include "./ResetConstraintsx/ResetConstraintsx.h"
    82 #include "./ResetCoordinateSystemx/ResetCoordinateSystemx.h"
     82#include "./ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h"
    8383#include "./RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h"
    8484#include "./Scotchx/Scotchx.h"
Note: See TracChangeset for help on using the changeset viewer.