Changeset 117


Ignore:
Timestamp:
04/28/09 17:47:16 (16 years ago)
Author:
Eric.Larour
Message:

Reshuffled ModelProcessor for better clarity

Location:
issm/trunk/src
Files:
13 added
7 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/ModelProcessorx/Model.cpp

    r88 r117  
    1818#include "stdio.h"
    1919
    20 #include "./ModelProcessorx.h"
     20#include "./Model.h"
    2121
    2222
    … …  
    378378        return;
    379379}
    380 
    381 /*!--------------------------------------------------
    382         ModelCreateElementsNodesAndMaterials
    383   --------------------------------------------------*/
    384 
    385 #undef __FUNCT__
    386 #define __FUNCT__ "ModelCreateElementsNodesAndMaterials"
    387 
    388 int     ModelCreateElementsNodesAndMaterials(DataSet** pelements,DataSet** pnodes, DataSet** pmaterials, Model* model,ConstDataHandle model_handle){
    389 
    390         int noerr=1;
    391 
    392         /*This is just a high level driver: */
    393         if ((strcmp(model->analysis_type,"diagnostic_horiz")==0)|| (strcmp(model->analysis_type,"control")==0)){
    394 
    395                 CreateElementsNodesAndMaterialsDiagnosticHoriz(pelements,pnodes,pmaterials, model,model_handle);
    396        
    397         }
    398         /*else if (strcmp(model->analysis_type,"diagnostic_basevert")==0){
    399 
    400                 noerr=CreateElementsNodesAndMaterialsDataSetsDiagnosticBaseVert(pelements,pnodes,pmaterials, model,model->analysis_type);
    401 
    402         }
    403         else if (strcmp(model->analysis_type,"diagnostic_vert")==0){
    404 
    405                 noerr=CreateElementsNodesAndMaterialsDataSetsDiagnosticVert(pelements,pnodes,pmaterials, model,model->analysis_type);
    406         }
    407         else if (strcmp(model->analysis_type,"melting")==0){
    408 
    409                 noerr=CreateElementsNodesAndMaterialsDataSetsMelting(pelements,pnodes,pmaterials, model,model->analysis_type);
    410         }
    411         else if (strcmp(model->analysis_type,"prognostic")==0){
    412 
    413                 noerr=CreateElementsNodesAndMaterialsDataSetsPrognostic(pelements,pnodes,pmaterials, model,model->analysis_type);
    414         }
    415         else if ((strcmp(model->analysis_type,"thermalsteady")==0) || (strcmp(model->analysis_type,"thermaltransient")==0)){
    416 
    417                 noerr=CreateElementsNodesAndMaterialsDataSetsThermal(pelements,pnodes,pmaterials, model,model->analysis_type);
    418         }*/
    419         else{
    420                 _printf_("%s%s\n",__FUNCT__,"error message: analysis_type not supported yet!");
    421         }
    422 
    423         return noerr;
    424 
    425 }
    426 
    427 
    428 /*! ModelCreateConstraints
    429  */
    430 
    431 #undef __FUNCT__
    432 #define __FUNCT__ "ModelCreateConstraints"
    433 
    434 int ModelCreateConstraints(DataSet** pconstraints, Model* model,ConstDataHandle model_handle){
    435        
    436         int noerr=1;
    437 
    438         /*This is just a high level driver: */
    439         if ((strcmp(model->analysis_type,"diagnostic_horiz")==0)|| (strcmp(model->analysis_type,"control")==0)){
    440                 noerr=CreateConstraintsDiagnosticHoriz(pconstraints,model,model_handle);
    441         }
    442         /*else if (strcmp(model->analysis_type,"diagnostic_basevert")==0){
    443                 noerr=CreateConstraintsDiagnosticBaseVert(pconstraints,model,model_handle);
    444         }
    445         else if (strcmp(model->analysis_type,"diagnostic_vert")==0){
    446                 noerr=CreateConstraintsDiagnosticVert(pconstraints,model,model_handle);
    447         }
    448         else if (strcmp(model->analysis_type,"melting")==0){
    449                 noerr=CreateConstraintsMelting(pconstraints,model,model_handle);
    450         }
    451         else if (strcmp(model->analysis_type,"prognostic")==0){
    452                 noerr=CreateConstraintsPrognostic(pconstraints,model,model_handle);
    453         }
    454         else if ((strcmp(model->analysis_type,"thermalsteady")==0) || (strcmp(model->analysis_type,"thermaltransient")==0)){
    455                 noerr=CreateConstraintsThermal(pconstraints,model,model_handle);
    456         }
    457         else{
    458                 _printf_("%s%s\n",__FUNCT__,"error message: model->analysis_type not supported yet!");
    459         }*/
    460 
    461         return noerr;
    462 
    463 }       
    464 
    465 
    466 
    467 /*! ModelCreateLoads
    468  */
    469 
    470 
    471 #undef __FUNCT__
    472 #define __FUNCT__ "ModelCreateLoads"
    473 
    474 int ModelCreateLoads(DataSet** ploads, Model* model,ConstDataHandle model_handle){
    475 
    476         int noerr=1;
    477 
    478         /*This is just a high level driver: */
    479         if ((strcmp(model->analysis_type,"diagnostic_horiz")==0)|| (strcmp(model->analysis_type,"control")==0)){
    480 
    481                 noerr=CreateLoadsDiagnosticHoriz(ploads,model,model_handle);
    482         }
    483         /*else if (strcmp(model->analysis_type,"diagnostic_basevert")==0){
    484 
    485                 noerr=CreateLoadsDiagnosticBaseVert(ploads,model,model_handle);
    486         }
    487         else if (strcmp(model->analysis_type,"diagnostic_vert")==0){
    488 
    489                 noerr=CreateLoadsDiagnosticVert(ploads,model,model_handle);
    490         }
    491         else if (strcmp(model->analysis_type,"melting")==0){
    492 
    493                 noerr=CreateLoadsMelting(ploads,model,model_handle);
    494         }
    495         else if (strcmp(model->analysis_type,"prognostic")==0){
    496 
    497                 noerr=CreateLoadsPrognostic(ploads,model,model_handle);
    498         }
    499         else if ((strcmp(model->analysis_type,"thermalsteady")==0) || (strcmp(model->analysis_type,"thermaltransient")==0)){
    500        
    501                 noerr=CreateLoadsThermal(ploads,model,model_handle);
    502 
    503         }
    504         else{
    505                 _printf_("%s%s\n",__FUNCT__,"error message: model->analysis_type not supported yet!");
    506         }*/
    507 
    508         return noerr;
    509 
    510 }

  • issm/trunk/src/c/io/ModelFetchData.cpp

    r1 r117  
    1010
    1111#include "./io.h"
    12 #include "../ModelProcessorx/ModelProcessorx.h"
     12#include "../ModelProcessorx/Model.h"
    1313#include "../shared/shared.h"
    1414

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

    r1 r117  
    4343#endif
    4444
     45int FetchRifts(int** priftsnumpenaltypairs,double*** priftspenaltypairs,int** priftsfill,double** priftsfriction,ConstDataHandle model_handle,int numrifts);
     46
    4547#endif  /* _IMDB_H */
    4648

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

    r109 r117  
    1818
    1919/*Modules: */
    20 #include "./ModelProcessorx/ModelProcessorx.h"
     20#include "./ModelProcessorx/Model.h"
    2121#include "./Dofx/Dofx.h"
    2222#include "./Dux/Dux.h"

  • issm/trunk/src/c/parallel/CreateFemModel.cpp

    r46 r117  
    3636
    3737        _printf_("   create elements, nodes and materials:\n");
    38         ModelCreateElementsNodesAndMaterials(&elements,&nodes,&materials,model,MODEL);
     38        CreateElementsNodesAndMaterials(&elements,&nodes,&materials,model,MODEL);
    3939
    4040        _printf_("   create constraints: \n");
    41         ModelCreateConstraints(&constraints,model,MODEL);
     41        CreateConstraints(&constraints,model,MODEL);
    4242       
    4343        _printf_("   create loads: \n");
    44         ModelCreateLoads(&loads,model,MODEL);
     44        CreateLoads(&loads,model,MODEL);
    4545
    4646        _printf_("   create parameters: \n");
    47         ModelCreateParameters(&parameters,model,MODEL);
     47        CreateParameters(&parameters,model,MODEL);
    4848
    4949        _printf_("   create degrees of freedom: \n");

  • issm/trunk/src/c/shared/Numerics/numerics.h

    r99 r117  
    1515void cross(double* result,double* vector1,double* vector2);
    1616double norm(double* vector);
     17int DistributeNumDofs(int *pnumdofs,int analysis_type);
    1718
    1819#endif //ifndef _NUMERICS_H_

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

    r1 r117  
    3232
    3333        /*Create elements, nodes and materials: */
    34         ModelCreateElementsNodesAndMaterials(&elements,&nodes,&materials,model,MODEL);
     34        CreateElementsNodesAndMaterials(&elements,&nodes,&materials,model,MODEL);
    3535
    3636        /*Create constraints: */
    37         ModelCreateConstraints(&constraints,model,MODEL);
     37        CreateConstraints(&constraints,model,MODEL);
    3838       
    3939        /*Create loads: */
    40         ModelCreateLoads(&loads,model,MODEL);
     40        CreateLoads(&loads,model,MODEL);
    4141       
    4242        /*Create parameters: */
    43         ModelCreateParameters(&parameters,model,MODEL);
     43        CreateParameters(&parameters,model,MODEL);
    4444
    4545        /*Write output data: */
Note: See TracChangeset for help on using the changeset viewer.