Changeset 4143


Ignore:
Timestamp:
06/23/10 08:15:36 (15 years ago)
Author:
Mathieu Morlighem
Message:

some debugging

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

Legend:

Unmodified
Added
Removed

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

    r4088 r4143  
    260260        DoubleExternalResultEnum,
    261261        DoubleVecExternalResultEnum,
     262        DoubleMatExternalResultEnum,
    262263        IntExternalResultEnum,
    263264        PetscVecExternalResultEnum,
    264265        StringExternalResultEnum,
    265266        JEnum,
     267        PatchEnum,
    266268        /*}}}*/
    267269        /*Convergence{{{1*/

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

    r4139 r4143  
    124124                                        ./objects/ExternalResults/DoubleVecExternalResult.h\
    125125                                        ./objects/ExternalResults/DoubleVecExternalResult.cpp\
     126                                        ./objects/ExternalResults/DoubleMatExternalResult.h\
     127                                        ./objects/ExternalResults/DoubleMatExternalResult.cpp\
    126128                                        ./objects/ExternalResults/IntExternalResult.h\
    127129                                        ./objects/ExternalResults/IntExternalResult.cpp\
    … …  
    651653                                        ./objects/ExternalResults/DoubleVecExternalResult.h\
    652654                                        ./objects/ExternalResults/DoubleVecExternalResult.cpp\
     655                                        ./objects/ExternalResults/DoubleMatExternalResult.h\
     656                                        ./objects/ExternalResults/DoubleMatExternalResult.cpp\
    653657                                        ./objects/ExternalResults/IntExternalResult.h\
    654658                                        ./objects/ExternalResults/IntExternalResult.cpp\

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

    r4139 r4143  
    9595
    9696        /*create Result object and add to results dataset: */
    97         results->AddObject(new DoubleMatExternalResult(results->Size()+1,PatchEnum,patch->numrows,patch->numcols,1,0));
     97        results->AddObject(new DoubleMatExternalResult(results->Size()+1,PatchEnum,patch->values,patch->numrows,patch->numcols,1,0));
    9898
    9999        /*Free ressources:*/

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

    r4139 r4143  
    1111
    1212#include "stdio.h"
     13#include "./OutputResultsx.h"
    1314#include "../../DataSet/DataSet.h"
    1415#include "../../io/io.h"

  • issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp

    r4139 r4143  
    147147        int     length;
    148148        int     type;
     149        int     size;
    149150        char   *name    = NULL;
    150151        double  boolean;

  • issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp

    r4139 r4143  
    147147        int     length;
    148148        int     type;
     149        int     size;
    149150        char   *name    = NULL;
    150151        extern  int my_rank;

  • issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

    r4139 r4143  
    2626}
    2727/*}}}*/
    28 /*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int enum_type,IssmDoubleMat values,int M,int N){{{1*/
     28/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step,double in_time){{{1*/
    2929DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int in_enum_type,double* in_values, int in_M,int in_N,int in_step,double in_time){
    3030
    … …  
    173173        int     length;
    174174        int     type;
     175        int     size;
    175176        char   *name    = NULL;
    176177        extern  int my_rank;

  • issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp

    r4139 r4143  
    169169        int     length;
    170170        int     type;
     171        int     size;
    171172        char   *name    = NULL;
    172173        extern  int my_rank;

  • issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp

    r4139 r4143  
    147147        int     length;
    148148        int     type;
     149        int     size;
    149150        char   *name    = NULL;
    150151        double  integer;
    … …  
    169170        /*writing a double, type is 1, size is 1: */
    170171        type=1;
    171         size=this->M;
     172        size=1;
    172173        fwrite(&type,sizeof(int),1,fid);
    173174        fwrite(&size,sizeof(int),1,fid);

  • issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp

    r4139 r4143  
    201201        int     length;
    202202        int     type;
     203        int     size;
    203204        char   *name      = NULL;
    204205        double *serialvec = NULL;

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

    r4050 r4143  
    6363#include "./ExternalResults/DoubleExternalResult.h"
    6464#include "./ExternalResults/DoubleVecExternalResult.h"
     65#include "./ExternalResults/DoubleMatExternalResult.h"
    6566#include "./ExternalResults/IntExternalResult.h"
    6667#include "./ExternalResults/PetscVecExternalResult.h"

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

    r4058 r4143  
    8484
    8585                _printf_("write results to disk:\n");
    86                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
     86                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
    8787        }
    8888        else{

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

    r4058 r4143  
    8282
    8383                _printf_("write results to disk:\n");
    84                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
     84                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
    8585
    8686        }

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

    r4058 r4143  
    8585
    8686                _printf_("write results to disk:\n");
    87                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
     87                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
    8888
    8989        }

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

    r4128 r4143  
    8686
    8787                _printf_("write results to disk:\n");
    88                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     88                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    8989        }
    9090        else{

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

    r4128 r4143  
    2222
    2323        /*write to disk: */
    24         OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     24        OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    2525
    2626}

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

    r4128 r4143  
    9696
    9797                _printf_("write results to disk:\n");
    98                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     98                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    9999        }
    100100        else{

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

    r4128 r4143  
    8686               
    8787                _printf_("write results to disk:\n");
    88                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     88                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    8989
    9090        }

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

    r4128 r4143  
    8585
    8686                _printf_("write results to disk:\n");
    87                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     87                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    8888
    8989        }

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

    r4128 r4143  
    103103
    104104                _printf_("write results to disk:\n");
    105                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     105                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    106106
    107107        }

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

    r4128 r4143  
    8686
    8787                _printf_("write results to disk:\n");
    88                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     88                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    8989        }
    9090        else{

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

    r4128 r4143  
    8888               
    8989                _printf_("write results to disk:\n");
    90                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     90                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    9191
    9292        }

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

    r4128 r4143  
    8282       
    8383                _printf_("write results to disk:\n");
    84                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     84                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    8585        }
    8686        else{

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

    r4128 r4143  
    8282       
    8383                _printf_("write results to disk:\n");
    84                 OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     84                OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    8585        }
    8686        else{

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

    r4128 r4143  
    7070                if (step%5==0){
    7171                        if(verbose)_printf_("%s","      saving temporary results...");
    72                         OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     72                        OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
    7373                }
    7474        }
Note: See TracChangeset for help on using the changeset viewer.