Changeset 1042


Ignore:
Timestamp:
06/22/09 13:36:42 (16 years ago)
Author:
seroussi
Message:

fixed pressure compute for ice and cielo_serial

Location:
issm/trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/m/classes/@node/display.m

    r1032 r1042  
    1010disp(sprintf('   z: %g',node.z));
    1111disp(sprintf('   s: %g',node.s));
     12disp(sprintf('   surface: %g',node.surface));
    1213disp(sprintf('   doflist: %i %i %i %i %i %i',node.doflist(1),node.doflist(2),node.doflist(3),node.doflist(4),node.doflist(5),node.doflist(6)));
    1314disp(sprintf('   gridset: %s',node.gridset));

  • issm/trunk/src/m/classes/@node/node.m

    r1032 r1042  
    1313        node.z=NaN;
    1414        node.s=NaN;
     15        node.surface=NaN;
    1516        node.doflist=zeros(6,1); %6 degrees of freedom available per node.
    1617        node.gridset='';

  • issm/trunk/src/m/solutions/cielo/diagnostic_core.m

    r1033 r1042  
    4040
    4141        displaystring(debug,'\n%s',['computing pressure according to MacAyeal...']);
    42         p_g=ComputePressure(m_dhu.elements,m_dhu.nodes,m_dhu.loads,m_dhu.materials,m_dhu.parameters);
     42        p_g=ComputePressure(m_dhu.elements,m_dhu.nodes,m_dhu.loads,m_dhu.materials,m_dhu.parameters,inputs);
    4343
    4444        displaystring(debug,'\n%s',['update boundary conditions for macyeal pattyn using hutter results...']);
    … …  
    5656
    5757        displaystring(debug,'\n%s',['computing pressure according to MacAyeal...']);
    58         p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters);
     58        p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
    5959end
    6060       
    … …  
    7474
    7575        displaystring(debug,'\n%s',['computing pressure according to Pattyn...']);
    76         p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters);
     76        p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
    7777       
    7878        if isstokes,

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

    r303 r1042  
    1515        DataSet* loads=NULL;
    1616        DataSet* materials=NULL;
     17        ParameterInputs* inputs=NULL;
    1718        int      numberofnodes;
    1819
    … …  
    3435
    3536        /*!Generate internal degree of freedom numbers: */
     37        /*Fetch inputs: */
     38        inputs=new ParameterInputs;
     39        inputs->Init(INPUTS);
     40
     41        UpdateFromInputsx(elements,nodes,loads, materials,inputs);
     42
     43        /*!Generate internal degree of freedom numbers: */
    3644        ComputePressurex(&p_g, elements,nodes,loads,materials,numberofnodes);
    3745
    … …  
    4452        delete materials;
    4553        delete loads;
     54        delete inputs;
    4655        VecFree(&p_g);
    4756
    … …  
    5261void ComputePressureUsage(void) {
    5362        _printf_("\n");
    54         _printf_("   usage: [p_g] = %s(elements, nodes, loads, materials, params);\n",__FUNCT__);
     63        _printf_("   usage: [p_g] = %s(elements, nodes, loads, materials, params,inputs);\n",__FUNCT__);
    5564        _printf_("\n");
    5665}

  • issm/trunk/src/mex/ComputePressure/ComputePressure.h

    r303 r1042  
    2222#define MATERIALS (mxArray*)prhs[3]
    2323#define PARAMS (mxArray*)prhs[4]
     24#define INPUTS (mxArray*)prhs[5]
    2425
    2526/* serial output macros: */
    … …  
    3031#define NLHS  1
    3132#undef NRHS
    32 #define NRHS  5
     33#define NRHS  6
    3334
    3435
Note: See TracChangeset for help on using the changeset viewer.