Changeset 22974 for issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp

Timestamp:

07/19/18 14:22:19 (7 years ago)

Author:

tpelle

Message:

CHG: working on getting groundingline height to work

File:

• issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp (modified) (5 diffs)

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

@@ -21 +21 @@
            }
 
-        /*PICO nelt rate parameterization (Reese et al., 2018)*/
+        /*PICO melt rate parameterization (Reese et al., 2018)*/
    femmodel->parameters->FindParam(&maxbox,BasalforcingsPicoMaxboxcountEnum);
    UpdateBoxIdsPico(femmodel);
@@ -32 +32 @@
         /*Optional buoyant plume melt rate parameterization (Lazeroms et al., 2018) */
         femmodel->parameters->FindParam(&isplume,BasalforcingsPicoIsplumeEnum);
-        if(isplume){
-                   ComputeSubshelfSlopePlume(femmodel);
-                        ComputeGroundingLineDepthPlume(femmodel);
-         ComputeBasalMeltPlume(femmodel);
-        }
+        if(isplume) ComputeBasalMeltPlume(femmodel);
 }/*}}}*/
 
@@ -52 +48 @@
         femmodel->elements->InputDuplicate(MaskGroundediceLevelsetEnum,DistanceToGroundinglineEnum);
         femmodel->DistanceToFieldValue(MaskGroundediceLevelsetEnum,0.,DistanceToGroundinglineEnum);
-        
+
         femmodel->elements->InputDuplicate(MaskIceLevelsetEnum,DistanceToCalvingfrontEnum);
         femmodel->DistanceToFieldValue(MaskIceLevelsetEnum,0.,DistanceToCalvingfrontEnum);
@@ -125 +121 @@
         IssmDouble* sumareas =xNew<IssmDouble>(num_basins*maxbox);
         ISSM_MPI_Allreduce(boxareas,sumareas,num_basins*maxbox,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
-        if(sumareas[0]==0){_error_("No elements in box 0, basal meltrates will be 0. Consider decreasing md.basalforcings.maxboxcount or refining your mesh!");}
+        //if(sumareas[0]==0){_error_("No elements in box 0, basal meltrates will be 0. Consider decreasing md.basalforcings.maxboxcount or refining your mesh!");}
         
         /*Update parameters to keep track of the new areas in future calculations*/
@@ -232 +228 @@
         xDelete<IssmDouble>(boxareas);
 }/*}}}*/
-void ComputeSubshelfSlopePlume(FemModel* femmodel){/*{{{*/
-        for(int i=0;i<femmodel->elements->Size();i++){
-                Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                element->PicoComputeBaseSlope();
-        }
-}/*}}}*/
-void ComputeGroundingLineDepthPlume(FemModel* femmodel){/*{{{*/
-        for(int i=0;i<femmodel->elements->Size();i++){
-                Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                element->PicoComputeGroundingLineDepth();
-        }
-}/*}}}*/
 void ComputeBasalMeltPlume(FemModel* femmodel){/*{{{*/
         for(int i=0;i<femmodel->elements->Size();i++){