Changeset 15128 for issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

Timestamp:

05/28/13 14:15:24 (12 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed ProcessUnits from core, moved everything to m/py

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (16 diffs)

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

@@ -1433 +1433 @@
                         for(i=0;i<6;i++)nodeinputs[i]=(IssmDouble)vector[penta_vertex_ids[i]-1];
 
-                        /*process units: */
-                        UnitConversion(&nodeinputs[0], 6 ,ExtToIuEnum, vector_enum);
-
                         /*create static input: */
                         this->inputs->AddInput(new PentaP1Input(vector_enum,nodeinputs));
@@ -1448 +1445 @@
                                         nodeinputs[i]=(IssmDouble)vector[N*row+t];
                                 }
-
-                                /*process units: */
-                                UnitConversion(&nodeinputs[0], 6 ,ExtToIuEnum, vector_enum);
 
                                 /*time? :*/
@@ -2595 +2589 @@
                         }
                 }
-        }
-}
-/*}}}*/
-/*FUNCTION Penta::ProcessResultsUnits{{{*/
-void  Penta::ProcessResultsUnits(void){
-
-        int i;
-
-        for(i=0;i<this->results->Size();i++){
-                ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i);
-                elementresult->ProcessUnits(this->parameters);
         }
 }
@@ -3288 +3271 @@
         IssmDouble minvel=this->inputs->Min(VelEnum);
 
-        /*process units if requested: */
-        if(process_units) minvel=UnitConversion(minvel,IuToExtEnum,VelEnum);
-
         /*Assign output pointers:*/
         *pminvel=minvel;
@@ -3301 +3281 @@
         IssmDouble minvx=this->inputs->Min(VxEnum);
 
-        /*process units if requested: */
-        if(process_units) minvx=UnitConversion(minvx,IuToExtEnum,VxEnum);
-
         /*Assign output pointers:*/
         *pminvx=minvx;
@@ -3314 +3291 @@
         IssmDouble minvy=this->inputs->Min(VyEnum);
 
-        /*process units if requested: */
-        if(process_units) minvy=UnitConversion(minvy,IuToExtEnum,VyEnum);
-
         /*Assign output pointers:*/
         *pminvy=minvy;
@@ -3326 +3300 @@
         /*Get minimum:*/
         IssmDouble minvz=this->inputs->Min(VzEnum);
-
-        /*process units if requested: */
-        if(process_units) minvz=UnitConversion(minvz,IuToExtEnum,VzEnum);
 
         /*Assign output pointers:*/
@@ -3364 +3335 @@
         IssmDouble maxabsvx=this->inputs->MaxAbs(VxEnum);
 
-        /*process units if requested: */
-        if(process_units) maxabsvx=UnitConversion(maxabsvx,IuToExtEnum,VxEnum);
-
         /*Assign output pointers:*/
         *pmaxabsvx=maxabsvx;
@@ -3377 +3345 @@
         IssmDouble maxabsvy=this->inputs->MaxAbs(VyEnum);
 
-        /*process units if requested: */
-        if(process_units) maxabsvy=UnitConversion(maxabsvy,IuToExtEnum,VyEnum);
-
         /*Assign output pointers:*/
         *pmaxabsvy=maxabsvy;
@@ -3390 +3355 @@
         IssmDouble maxabsvz=this->inputs->MaxAbs(VzEnum);
 
-        /*process units if requested: */
-        if(process_units) maxabsvz=UnitConversion(maxabsvz,IuToExtEnum,VyEnum);
-
         /*Assign output pointers:*/
         *pmaxabsvz=maxabsvz;
@@ -3403 +3365 @@
         IssmDouble maxvel=this->inputs->Max(VelEnum);
 
-        /*process units if requested: */
-        if(process_units) maxvel=UnitConversion(maxvel,IuToExtEnum,VelEnum);
-
         /*Assign output pointers:*/
         *pmaxvel=maxvel;
@@ -3417 +3376 @@
         IssmDouble maxvx=this->inputs->Max(VxEnum);
 
-        /*process units if requested: */
-        if(process_units) maxvx=UnitConversion(maxvx,IuToExtEnum,VxEnum);
-
         /*Assign output pointers:*/
         *pmaxvx=maxvx;
@@ -3430 +3386 @@
         IssmDouble maxvy=this->inputs->Max(VyEnum);
 
-        /*process units if requested: */
-        if(process_units) maxvy=UnitConversion(maxvy,IuToExtEnum,VyEnum);
-
         /*Assign output pointers:*/
         *pmaxvy=maxvy;
@@ -3442 +3395 @@
         /*Get maximum:*/
         IssmDouble maxvz=this->inputs->Max(VzEnum);
-
-        /*process units if requested: */
-        if(process_units) maxvz=UnitConversion(maxvz,IuToExtEnum,VzEnum);
 
         /*Assign output pointers:*/
@@ -3470 +3420 @@
                                 vel_input->GetInputAverage(&vel);
 
-                                /*process units if requested: */
-                                if(process_units) vel=UnitConversion(vel,IuToExtEnum,VelEnum);
-
                                 /*Assign output pointers:*/
                                 *presponse=vel;
@@ -3508 +3455 @@
         smb_input->GetInputAverage(&smb);
         Total_Smb=rho_ice*base*smb;// smb on element in kg s-1
-
-        /*Process units: */
-        Total_Smb=UnitConversion(Total_Smb,IuToExtEnum,TotalSmbEnum);// smb on element in GigaTon yr-1
 
         /*Return: */