Changeset 3496


Ignore:
Timestamp:
04/09/10 11:10:43 (15 years ago)
Author:
Mathieu Morlighem
Message:

Fixed partitioning used by processparams

Location:
issm/trunk/src/c
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/DataSet/DataSet.cpp

    r3476 r3496  
    902902        for ( object=objects.begin() ; object < objects.end(); object++ ){
    903903
    904                 /*Check this is a object: */
    905                 if((*object)->Enum()==NodeEnum()){
    906 
    907                         dofobject=dynamic_cast<DofObject*>(*object);
    908                         dofobject->CreatePartition(partition);
    909                 }
     904                dofobject=dynamic_cast<DofObject*>(*object);
     905                dofobject->CreatePartition(partition);
    910906        }
    911907

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

    r3463 r3496  
    1414#include "./FemModel.h"
    1515
    16 /*Object constructors, destructors: {{{1:*/
     16/*constructors/destructors*/
     17/*FUNCTION FemModel::FemModel {{{1*/
    1718FemModel::FemModel(){
    1819
    … …  
    3536
    3637}
    37 
     38/*}}}*/
     39/*FUNCTION FemModel::FemModel {{{1*/
    3840FemModel::FemModel(DataSet* femmodel_elements,DataSet* femmodel_nodes,DataSet* femmodel_vertices, DataSet* femmodel_constraints,DataSet* femmodel_loads,
    3941                DataSet* femmodel_materials,DataSet* femmodel_parameters, DofVec* femmodel_partition,DofVec* femmodel_tpartition,DofVec* femmodel_yg,
    … …  
    5961
    6062}
    61 
     63/*}}}*/
     64/*FUNCTION FemModel::~FemModel {{{1*/
    6265FemModel::~FemModel(){
    6366
    … …  
    8184}
    8285/*}}}*/
    83 /* Object management: {{{1*/
     86
     87/*object functions*/
     88/*FUNCTION FemModel::Echo {{{1*/
    8489void FemModel::Echo(void){
    8590
    … …  
    102107
    103108}
    104 
     109/*}}}*/
     110/*FUNCTION FemModel::DeepEcho {{{1*/
    105111void FemModel::DeepEcho(void){
    106112       
    … …  
    137143
    138144}
     145/*}}}*/
     146/*FUNCTION FemModel::GetId {{{1*/
    139147int   FemModel::GetId(void){
    140148        ISSMERROR("not implemented yet!");
    141149}
    142 
     150/*}}}*/
     151/*FUNCTION FemModel::MyRank {{{1*/
    143152int   FemModel::MyRank(void){
    144153        ISSMERROR("not implemented yet!");
    145154}
    146 
     155/*}}}*/
     156/*FUNCTION FemModel::Marshall {{{1*/
    147157void  FemModel::Marshall(char** pmarshalled_dataset){
    148158        ISSMERROR("not implemented yet!");
    149159}
    150 
     160/*}}}*/
     161/*FUNCTION FemModel::MarshallSize {{{1*/
    151162int   FemModel::MarshallSize(void){
    152163        ISSMERROR("not implemented yet!");
    153164}
     165/*}}}*/
     166/*FUNCTION FemModel::GetName {{{1*/
    154167char*   FemModel::GetName(void){
    155168        ISSMERROR("not implemented yet!");
    156169}
     170/*}}}*/
     171/*FUNCTION FemModel::Demarshall {{{1*/
    157172void  FemModel::Demarshall(char** pmarshalled_dataset){
    158173        ISSMERROR("not implemented yet!");
    159174}
     175/*}}}*/
     176/*FUNCTION FemModel::Enum {{{1*/
    160177int   FemModel::Enum(void){
    161178        ISSMERROR("not implemented yet!");
    162179}
     180/*}}}*/
     181/*FUNCTION FemModel::copy {{{1*/
    163182Object* FemModel::copy(void){
    164183        ISSMERROR("not implemented yet!");
    165184}
    166 
    167 
     185/*}}}*/
     186/*FUNCTION FemModel::FindParam(double* pscalar,char* name) {{{1*/
    168187int FemModel::FindParam(double* pscalar,char* name){
    169188       
    … …  
    171190
    172191}
     192/*}}}*/
     193/*FUNCTION FemModel::FindParam(int* pinteger,char* name) {{{1*/
    173194int FemModel::FindParam(int* pinteger,char* name){
    174195       
    … …  
    176197
    177198}
    178 
     199/*}}}*/
     200/*FUNCTION FemModel::FindParam(char** pstring,char* name) {{{1*/
    179201int FemModel::FindParam(char** pstring,char* name){
    180202       
    … …  
    182204
    183205}
    184 
     206/*}}}*/
     207/*FUNCTION FemModel::FindParam(char*** pstringarray,int* pM,char* name) {{{1*/
    185208int FemModel::FindParam(char*** pstringarray,int* pM,char* name){
    186209       
    … …  
    188211
    189212}
    190 
     213/*}}}*/
     214/*FUNCTION FemModel::FindParam(double** pdoublearray,int* pM,int* pN,char* name) {{{1*/
    191215int FemModel::FindParam(double** pdoublearray,int* pM,int* pN,char* name){
    192216       
    … …  
    194218
    195219}
    196 
     220/*}}}*/
     221/*FUNCTION FemModel::FindParam(Vec* pvec,char* name) {{{1*/
    197222int FemModel::FindParam(Vec* pvec,char* name){
    198223       
    … …  
    200225
    201226}
    202 
     227/*}}}*/
     228/*FUNCTION FemModel::FindParam(Mat* pmat,char* name) {{{1*/
    203229int FemModel::FindParam(Mat* pmat,char* name){
    204230       
    … …  
    206232
    207233}
    208 
     234/*}}}*/
    209235
    210236/*access to internal data: */
    211 DataSet*            FemModel::get_elements(void){return elements;}
    212 DataSet*            FemModel::get_nodes(void){return nodes ;}
    213 DataSet*            FemModel::get_vertices(void){return vertices ;}
    214 DataSet*            FemModel::get_constraints(void){return constraints ;}
    215 DataSet*            FemModel::get_loads(void){return loads;}
    216 DataSet*            FemModel::get_materials(void){return materials;}
    217 DataSet*            FemModel::get_parameters(void){return parameters;}
    218 DofVec*                 FemModel::get_partition(void){return partition;}
    219 DofVec*                 FemModel::get_tpartition(void){return tpartition;}
    220 DofVec*                 FemModel::get_yg(void){return yg;}
    221 Mat                 FemModel::get_Rmg(void){return Rmg;}
    222 NodeSets*           FemModel::get_nodesets(void){return nodesets;}
    223 Vec                 FemModel::get_ys(void){return ys;}
    224 Vec                 FemModel::get_ys0(void){return ys0;}
    225 Mat                 FemModel::get_Gmn(void){return Gmn;}
    226 /*}}}*/
     237/*FUNCTION FemModel::get_elements {{{1*/
     238DataSet* FemModel::get_elements(void){
     239        return elements;
     240}
     241/*}}}*/
     242/*FUNCTION FemModel::get_nodes {{{1*/
     243DataSet* FemModel::get_nodes(void){
     244        return nodes;
     245}
     246/*}}}*/
     247/*FUNCTION FemModel::get_vertices {{{1*/
     248DataSet* FemModel::get_vertices(void){
     249        return vertices;
     250}
     251/*}}}*/
     252/*FUNCTION FemModel::get_constraints {{{1*/
     253DataSet* FemModel::get_constraints(void){
     254        return constraints;
     255}
     256/*}}}*/
     257/*FUNCTION FemModel::get_loads {{{1*/
     258DataSet* FemModel::get_loads(void){
     259        return loads;
     260}
     261/*}}}*/
     262/*FUNCTION FemModel::get_materials {{{1*/
     263DataSet* FemModel::get_materials(void){
     264        return materials;
     265}
     266/*}}}*/
     267/*FUNCTION FemModel::get_parameters {{{1*/
     268DataSet* FemModel::get_parameters(void){
     269        return parameters;
     270}
     271/*}}}*/
     272/*FUNCTION FemModel::get_partition {{{1*/
     273DofVec* FemModel::get_partition(void){
     274        return partition;
     275}
     276/*}}}*/
     277/*FUNCTION FemModel::get_tpartition {{{1*/
     278DofVec* FemModel::get_tpartition(void){
     279        return tpartition;
     280}
     281/*}}}*/
     282/*FUNCTION FemModel::get_yg {{{1*/
     283DofVec* FemModel::get_yg(void){
     284        return yg;
     285}
     286/*}}}*/
     287/*FUNCTION FemModel::get_Rmg {{{1*/
     288Mat FemModel::get_Rmg(void){
     289        return Rmg;
     290}
     291/*}}}*/
     292/*FUNCTION FemModel::get_nodesets {{{1*/
     293NodeSets* FemModel::get_nodesets(void){
     294        return nodesets;
     295}
     296/*}}}*/
     297/*FUNCTION FemModel::get_ys {{{1*/
     298Vec FemModel::get_ys(void){
     299        return ys;
     300}
     301/*}}}*/
     302/*FUNCTION FemModel::get_ys0 {{{1*/
     303Vec FemModel::get_ys0(void){
     304        return ys0;
     305}
     306/*}}}*/
     307/*FUNCTION FemModel::get_Gmn {{{1*/
     308Mat FemModel::get_Gmn(void){
     309        return Gmn;
     310}
     311/*}}}*/

  • issm/trunk/src/c/shared/Elements/elements.h

    r3159 r3496  
    1212double Paterson(double temperature);
    1313int GetVerticesCoordinates(double* xyz,  Node** nodes, int numgrids);
     14inline void printarray(double* array,int lines,int cols){
     15        int i,j;
     16        printf("\n");
     17        for (i=0;i<lines;i++){ 
     18                printf("   [ ");
     19                for (j=0;j<cols;j++){
     20                        printf(" %10g ",array[i*cols+j]);
     21                } 
     22                printf(" ]\n");
     23        } 
     24        printf("\n");
     25}
    1426
    1527#endif //ifndef _SHARED_ELEMENTS_H_
    16 
Note: See TracChangeset for help on using the changeset viewer.