Changeset 1817


Ignore:
Timestamp:
08/24/09 17:43:38 (16 years ago)
Author:
Eric.Larour
Message:

Brachning back from issm.controlstatic, by hand

Location:
issm/trunk/src/c/parallel
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1719 r1817  
    1313#include "../issm.h"
    1414
    15 void transient_core_2d(DataSet* results,FemModel* fems, ParameterInputs* inputs){
     15void transient_core_2d(DataSet* results,Model* model, ParameterInputs* inputs){
    1616
    1717        extern int my_rank;
    … …  
    6464
    6565        /*recover fem models: */
    66         fem_dh=fems+0;
    67         fem_dv=fems+1;
    68         fem_ds=fems+2;
    69         fem_dhu=fems+3;
    70         fem_sl=fems+4;
    71         fem_p=fems+5;
     66        fem_dh=model->DiagnosticHorizontal();
     67        fem_dv=model->DiagnosticVertical();
     68        fem_ds=model->DiagnosticStokes();
     69        fem_dhu=model->DiagnosticHutter();
     70        fem_sl=model->Slope();
     71        fem_p=model->Prognostic();
     72
    7273
    7374        //first recover parameters common to all solutions
    … …  
    120121                _printf_("%s\n","computing new velocity");
    121122                diagnostic_results=new DataSet(ResultsEnum());
    122                 diagnostic_core(diagnostic_results,fems, inputs);
     123                diagnostic_core(diagnostic_results,model, inputs);
    123124
    124125                //extract u_g and p_g from diagnostic_results, and erase diagnostic_results;
    … …  
    132133                inputs->Add("velocity",u_g,2,numberofnodes);
    133134                prognostic_results=new DataSet(ResultsEnum());
    134                 prognostic_core(prognostic_results,fem_p, inputs);
     135                prognostic_core(prognostic_results,model, inputs);
    135136       
    136137                //extract h_g prognostic_results, and erase prognostic_results;

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

    r1719 r1817  
    1313#include "../issm.h"
    1414
    15 void transient_core_3d(DataSet* results,FemModel* fems, ParameterInputs* inputs){
     15void transient_core_3d(DataSet* results,Model* model, ParameterInputs* inputs){
    1616
    1717        extern int my_rank;
    … …  
    7070
    7171        /*recover fem models: */
    72         fem_dh=fems+0;
    73         fem_dv=fems+1;
    74         fem_ds=fems+2;
    75         fem_dhu=fems+3;
    76         fem_sl=fems+4;
    77         fem_p=fems+5;
    78 
    79         fem_t=fems+6;
    80         fem_m=fems+7;
     72        fem_dh=model->DiagnosticHorizontal();
     73        fem_dv=model->DiagnosticVertical();
     74        fem_ds=model->DiagnosticStokes();
     75        fem_dhu=model->DiagnosticHutter();
     76        fem_sl=model->Slope();
     77        fem_p=model->Prognostic();
     78        fem_t=model->Thermal();
     79        fem_m=model->Melting();
     80
    8181
    8282        //first recover parameters common to all solutions
    … …  
    152152                //Deal with velocities.
    153153                diagnostic_results=new DataSet(ResultsEnum());
    154                 diagnostic_core(diagnostic_results,fems, inputs);
     154                diagnostic_core(diagnostic_results,model, inputs);
    155155
    156156                //extract u_g and p_g from diagnostic_results, and erase diagnostic_results;
    … …  
    163163               
    164164                inputs->Add("velocity",u_g,3,numberofnodes);
    165                 prognostic_results=new DataSet(ResultsEnum()); prognostic_core(prognostic_results,fem_p, inputs);
     165                prognostic_results=new DataSet(ResultsEnum()); prognostic_core(prognostic_results,model, inputs);
    166166       
    167167                //extract h_g prognostic_results, and erase prognostic_results;
Note: See TracChangeset for help on using the changeset viewer.