Ignore:
Timestamp:
05/28/13 15:16:02 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: removing all process_units

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r15129 r15130  
    24292429/*}}}*/
    24302430/*FUNCTION Penta::NodalValue {{{*/
    2431 int    Penta::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum,bool process_units){
     2431int    Penta::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){
    24322432
    24332433        int i;
    … …  
    29842984
    29852985        /*Get for Vx and Vy, the max of abs value: */
    2986         this->MaxAbsVx(&maxabsvx,false);
    2987         this->MaxAbsVy(&maxabsvy,false);
    2988         this->MaxAbsVz(&maxabsvz,false);
     2986        this->MaxAbsVx(&maxabsvx);
     2987        this->MaxAbsVy(&maxabsvy);
     2988        this->MaxAbsVz(&maxabsvz);
    29892989
    29902990        /* Get node coordinates and dof list: */
    … …  
    32663266/*}}}*/
    32673267/*FUNCTION Penta::MinVel{{{*/
    3268 void  Penta::MinVel(IssmDouble* pminvel, bool process_units){
     3268void  Penta::MinVel(IssmDouble* pminvel){
    32693269
    32703270        /*Get minimum:*/
    … …  
    32763276/*}}}*/
    32773277/*FUNCTION Penta::MinVx{{{*/
    3278 void  Penta::MinVx(IssmDouble* pminvx, bool process_units){
     3278void  Penta::MinVx(IssmDouble* pminvx){
    32793279
    32803280        /*Get minimum:*/
    … …  
    32863286/*}}}*/
    32873287/*FUNCTION Penta::MinVy{{{*/
    3288 void  Penta::MinVy(IssmDouble* pminvy, bool process_units){
     3288void  Penta::MinVy(IssmDouble* pminvy){
    32893289
    32903290        /*Get minimum:*/
    … …  
    32963296/*}}}*/
    32973297/*FUNCTION Penta::MinVz{{{*/
    3298 void  Penta::MinVz(IssmDouble* pminvz, bool process_units){
     3298void  Penta::MinVz(IssmDouble* pminvz){
    32993299
    33003300        /*Get minimum:*/
    … …  
    33063306/*}}}*/
    33073307/*FUNCTION Penta::MassFlux {{{*/
    3308 IssmDouble Penta::MassFlux( IssmDouble* segment,bool process_units){
     3308IssmDouble Penta::MassFlux( IssmDouble* segment){
    33093309
    33103310        IssmDouble mass_flux=0;
    … …  
    33183318        /*Spawn Tria element from the base of the Penta: */
    33193319        Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria.
    3320         mass_flux=tria->MassFlux(segment,process_units);
     3320        mass_flux=tria->MassFlux(segment);
    33213321        delete tria->material; delete tria;
    33223322
    … …  
    33303330/*}}}*/
    33313331/*FUNCTION Penta::MaxAbsVx{{{*/
    3332 void  Penta::MaxAbsVx(IssmDouble* pmaxabsvx, bool process_units){
     3332void  Penta::MaxAbsVx(IssmDouble* pmaxabsvx){
    33333333
    33343334        /*Get maximum:*/
    … …  
    33403340/*}}}*/
    33413341/*FUNCTION Penta::MaxAbsVy{{{*/
    3342 void  Penta::MaxAbsVy(IssmDouble* pmaxabsvy, bool process_units){
     3342void  Penta::MaxAbsVy(IssmDouble* pmaxabsvy){
    33433343
    33443344        /*Get maximum:*/
    … …  
    33503350/*}}}*/
    33513351/*FUNCTION Penta::MaxAbsVz{{{*/
    3352 void  Penta::MaxAbsVz(IssmDouble* pmaxabsvz, bool process_units){
     3352void  Penta::MaxAbsVz(IssmDouble* pmaxabsvz){
    33533353
    33543354        /*Get maximum:*/
    … …  
    33603360/*}}}*/
    33613361/*FUNCTION Penta::MaxVel{{{*/
    3362 void  Penta::MaxVel(IssmDouble* pmaxvel, bool process_units){
     3362void  Penta::MaxVel(IssmDouble* pmaxvel){
    33633363
    33643364        /*Get maximum:*/
    … …  
    33713371/*}}}*/
    33723372/*FUNCTION Penta::MaxVx{{{*/
    3373 void  Penta::MaxVx(IssmDouble* pmaxvx, bool process_units){
     3373void  Penta::MaxVx(IssmDouble* pmaxvx){
    33743374
    33753375        /*Get maximum:*/
    … …  
    33813381/*}}}*/
    33823382/*FUNCTION Penta::MaxVy{{{*/
    3383 void  Penta::MaxVy(IssmDouble* pmaxvy, bool process_units){
     3383void  Penta::MaxVy(IssmDouble* pmaxvy){
    33843384
    33853385        /*Get maximum:*/
    … …  
    33913391/*}}}*/
    33923392/*FUNCTION Penta::MaxVz{{{*/
    3393 void  Penta::MaxVz(IssmDouble* pmaxvz, bool process_units){
     3393void  Penta::MaxVz(IssmDouble* pmaxvz){
    33943394
    33953395        /*Get maximum:*/
    … …  
    54155415/*}}}*/
    54165416/*FUNCTION Penta::SurfaceAverageVelMisfit {{{*/
    5417 IssmDouble Penta::SurfaceAverageVelMisfit(bool process_units,int weight_index){
     5417IssmDouble Penta::SurfaceAverageVelMisfit(int weight_index){
    54185418
    54195419        int    approximation;
    … …  
    54385438                 * and compute SurfaceAverageVelMisfit*/
    54395439                tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria (lower face).
    5440                 J=tria->SurfaceAverageVelMisfit(process_units,weight_index);
     5440                J=tria->SurfaceAverageVelMisfit(weight_index);
    54415441                delete tria->material; delete tria;
    54425442                return J;
    … …  
    54455445
    54465446                tria=(Tria*)SpawnTria(3,4,5); //nodes 3, 4 and 5 make the new tria (upper face).
    5447                 J=tria->SurfaceAverageVelMisfit(process_units,weight_index);
     5447                J=tria->SurfaceAverageVelMisfit(weight_index);
    54485448                delete tria->material; delete tria;
    54495449                return J;
    … …  
    54525452/*}}}*/
    54535453/*FUNCTION Penta::SurfaceAbsVelMisfit {{{*/
    5454 IssmDouble Penta::SurfaceAbsVelMisfit(bool process_units,int weight_index){
     5454IssmDouble Penta::SurfaceAbsVelMisfit(int weight_index){
    54555455
    54565456        int    approximation;
    … …  
    54755475                 * and compute SurfaceAbsVelMisfit*/
    54765476                tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria (lower face).
    5477                 J=tria->SurfaceAbsVelMisfit(process_units,weight_index);
     5477                J=tria->SurfaceAbsVelMisfit(weight_index);
    54785478                delete tria->material; delete tria;
    54795479                return J;
    … …  
    54825482
    54835483                tria=(Tria*)SpawnTria(3,4,5); //nodes 3, 4 and 5 make the new tria (upper face).
    5484                 J=tria->SurfaceAbsVelMisfit(process_units,weight_index);
     5484                J=tria->SurfaceAbsVelMisfit(weight_index);
    54855485                delete tria->material; delete tria;
    54865486                return J;
    … …  
    54895489/*}}}*/
    54905490/*FUNCTION Penta::SurfaceLogVelMisfit {{{*/
    5491 IssmDouble Penta::SurfaceLogVelMisfit(bool process_units,int weight_index){
     5491IssmDouble Penta::SurfaceLogVelMisfit(int weight_index){
    54925492
    54935493        int    approximation;
    … …  
    55125512                 * and compute SurfaceLogVelMisfit*/
    55135513                tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria (lower face).
    5514                 J=tria->SurfaceLogVelMisfit(process_units,weight_index);
     5514                J=tria->SurfaceLogVelMisfit(weight_index);
    55155515                delete tria->material; delete tria;
    55165516                return J;
    … …  
    55195519
    55205520                tria=(Tria*)SpawnTria(3,4,5); //nodes 3, 4 and 5 make the new tria (upper face).
    5521                 J=tria->SurfaceLogVelMisfit(process_units,weight_index);
     5521                J=tria->SurfaceLogVelMisfit(weight_index);
    55225522                delete tria->material; delete tria;
    55235523                return J;
    … …  
    55265526/*}}}*/
    55275527/*FUNCTION Penta::SurfaceLogVxVyMisfit {{{*/
    5528 IssmDouble Penta::SurfaceLogVxVyMisfit(bool process_units,int weight_index){
     5528IssmDouble Penta::SurfaceLogVxVyMisfit(int weight_index){
    55295529
    55305530        IssmDouble J;
    … …  
    55515551                 * and compute SurfaceLogVxVyMisfit*/
    55525552                tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria (lower face).
    5553                 J=tria->SurfaceLogVxVyMisfit(process_units,weight_index);
     5553                J=tria->SurfaceLogVxVyMisfit(weight_index);
    55545554                delete tria->material; delete tria;
    55555555                return J;
    … …  
    55585558
    55595559                tria=(Tria*)SpawnTria(3,4,5); //nodes 3, 4 and 5 make the new tria (upper face).
    5560                 J=tria->SurfaceLogVxVyMisfit(process_units,weight_index);
     5560                J=tria->SurfaceLogVxVyMisfit(weight_index);
    55615561                delete tria->material; delete tria;
    55625562                return J;
    … …  
    55655565/*}}}*/
    55665566/*FUNCTION Penta::SurfaceRelVelMisfit {{{*/
    5567 IssmDouble Penta::SurfaceRelVelMisfit(bool process_units,int weight_index){
     5567IssmDouble Penta::SurfaceRelVelMisfit(int weight_index){
    55685568
    55695569        int    approximation;
    … …  
    55885588                 * and compute SurfaceRelVelMisfit*/
    55895589                tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria (lower face).
    5590                 J=tria->SurfaceRelVelMisfit(process_units,weight_index);
     5590                J=tria->SurfaceRelVelMisfit(weight_index);
    55915591                delete tria->material; delete tria;
    55925592                return J;
    … …  
    55955595
    55965596                tria=(Tria*)SpawnTria(3,4,5); //nodes 3, 4 and 5 make the new tria (upper face).
    5597                 J=tria->SurfaceRelVelMisfit(process_units,weight_index);
     5597                J=tria->SurfaceRelVelMisfit(weight_index);
    55985598                delete tria->material; delete tria;
    55995599                return J;
    … …  
    56025602/*}}}*/
    56035603/*FUNCTION Penta::ThicknessAbsGradient{{{*/
    5604 IssmDouble Penta::ThicknessAbsGradient(bool process_units,int weight_index){
     5604IssmDouble Penta::ThicknessAbsGradient(int weight_index){
    56055605
    56065606        _error_("Not implemented yet");
    … …  
    56085608/*}}}*/
    56095609/*FUNCTION Penta::ThicknessAbsMisfit {{{*/
    5610 IssmDouble Penta::ThicknessAbsMisfit(bool process_units,int weight_index){
     5610IssmDouble Penta::ThicknessAbsMisfit(int weight_index){
    56115611
    56125612        int    approximation;
    … …  
    56225622
    56235623        tria=(Tria*)SpawnTria(0,1,2);
    5624         J=tria->ThicknessAbsMisfit(process_units,weight_index);
     5624        J=tria->ThicknessAbsMisfit(weight_index);
    56255625        delete tria->material; delete tria;
    56265626        return J;
    … …  
    56285628/*}}}*/
    56295629/*FUNCTION Penta::DragCoefficientAbsGradient{{{*/
    5630 IssmDouble Penta::DragCoefficientAbsGradient(bool process_units,int weight_index){
     5630IssmDouble Penta::DragCoefficientAbsGradient(int weight_index){
    56315631
    56325632        IssmDouble J;
    … …  
    56375637
    56385638        tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria
    5639         J=tria->DragCoefficientAbsGradient(process_units,weight_index);
     5639        J=tria->DragCoefficientAbsGradient(weight_index);
    56405640        delete tria->material; delete tria;
    56415641        return J;
    … …  
    56435643/*}}}*/
    56445644/*FUNCTION Penta::RheologyBbarAbsGradient{{{*/
    5645 IssmDouble Penta::RheologyBbarAbsGradient(bool process_units,int weight_index){
     5645IssmDouble Penta::RheologyBbarAbsGradient(int weight_index){
    56465646
    56475647        IssmDouble J;
    … …  
    56525652
    56535653        tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria
    5654         J=tria->RheologyBbarAbsGradient(process_units,weight_index);
     5654        J=tria->RheologyBbarAbsGradient(weight_index);
    56555655        delete tria->material; delete tria;
    56565656        return J;
Note: See TracChangeset for help on using the changeset viewer.