Changeset 22473

Timestamp:

02/26/18 11:08:02 (7 years ago)

Author:

tpelle

Message:

CHG: fixgin compilation

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (4 diffs)
• classes/Elements/Tria.h (modified) (1 diff)
• modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (modified) (3 diffs)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -274 +274 @@
                 virtual int        NumberofNodesVelocity(void)=0;
                 virtual void       PicoUpdateBoxid(int* pmax_boxid_basin)=0;
+                virtual void       PicoUpdateFirstBox(void){_error_("not implemented");};
                 virtual void       PotentialUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding)=0;
                 virtual int        PressureInterpolation()=0;

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

@@ -2788 +2788 @@
         rhow                    = this->GetMaterialParameter(MaterialsRhoSeawaterEnum);
         earth_grav  = this->GetMaterialParameter(ConstantsGEnum);
-        rho_star                = 1033;             //kg/m^3
+        rho_star                = 1033.;             //kg/m^3
         nu                              = rhoi/rhow;
         latentheat      = this->GetMaterialParameter(MaterialsLatentheatEnum);
@@ -2801 +2801 @@
         this->parameters->FindParam(&gamma_T,BasalforcingsPicoGammaTEnum);
         this->parameters->FindParam(&overturning_coeff,BasalforcingsPicoOverturningCoeffEnum);
-        this->parameters->FindParam(&t_farocean,BasalforcingsPicoFarOceanTemperatureEnum);
-        this->parameters->FindParam(&s_farocean,BasalforcingsPicoFarOceanSalinityEnum);
+        this->parameters->FindParam(&t_farocean,BasalforcingsPicoFarOceansalinityEnum);
+        this->parameters->FindParam(&s_farocean,BasalforcingsPicoFarOceansalinityEnum);
 
         this->inputs->GetInputValue(&basinid,BasalforcingsPicoBasinIdEnum);
@@ -2808 +2808 @@
         this->inputs->GetInputValue(&maxbox,BasalforcingsPicoMaxboxcountEnum);
         this->inputs->GetInputValue(&thickness,ThicknessEnum);
+
+        _error_("to be continued");
+        /*
 
         toc_farocean = t_farocean[basinid];
@@ -2827 +2830 @@
 
         this->AddInput(BasalforcingsGroundediceMeltingRateEnum,basalmeltingrates,this->GetElementType());
+        */
 
 }

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -111 +111 @@
                 int         NumberofNodesVelocity(void);
                 void        PicoUpdateBoxid(int* pmax_boxid_basin);
+                void        PicoUpdateFirstBox(void);
                 void        PotentialUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding);
                 int         PressureInterpolation();

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp

@@ -107 +107 @@
 
         //2 Get area of the boxes
-        boxareas=new Vector<IssmDouble>(num_basins*maxbox);
+        boxareas=xNew<IssmDouble>(num_basins*maxbox);
         for(i=0;i<num_basins*maxbox;i++){boxareas[i]=0.;}
         for(i=0;i<femmodel->elements->Size();i++){
@@ -114 +114 @@
                 element->inputs->GetInputValue(&basinid,BasalforcingsPicoBasinIdEnum);
                 element->inputs->GetInputValue(&boxid,BasalforcingsPicoBoxIdEnum);
-                boxareas[basinid*maxbox+boxid]+=element->GetArea();
+                _error_("fix thi");
+                //boxareas[basinid*maxbox+boxid]+=element->GetArea();
         }
 
@@ -138 +139 @@
         xDelete<IssmDouble>(t_farocean);
    xDelete<IssmDouble>(s_farocean);
-        xDelete<IssmDouble>(element);
 }/*}}}*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -213 +213 @@
                                 parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.gamma_T",BasalforcingsPicoGammaTEnum));
                                 iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.farocean_temperature");
-                                parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceanTemperatureEnum,&transparam[0],&transparam[M*(N-1)],interp,M,N));
+                                parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceantemperatureEnum,&transparam[0],&transparam[M*(N-1)],interp,M,N));
                                 iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.farocean_salinity");
-                                parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceanSalinityEnum,&transparam[0],&transparam[M*(N-1)],interp,M,N));
+                                parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceansalinityEnum,&transparam[0],&transparam[M*(N-1)],interp,M,N));
                         break;
                 default: