Changeset 21894

Timestamp:

07/28/17 10:11:59 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: extrude melt rates to avoid error

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• classes/Inputs/PentaInput.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -313 +313 @@
                 ComputeBasalMeltingrate(element);
         }
+        femmodel->parameters->SetParam(BasalforcingsGroundediceMeltingRateEnum,InputToExtrudeEnum);
+        extrudefrombase_core(femmodel);
 }/*}}}*/
 void           EnthalpyAnalysis::ComputeBasalMeltingrate(Element* element){/*{{{*/

issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp

@@ -246 +246 @@
                         }
                         break;
+                case P1xP3Enum:
+                        if(start==-1){
+                                for(int i=0+3;i<12;i+=3) this->values[i]=this->values[0];
+                                for(int i=1+3;i<12;i+=3) this->values[i]=this->values[1];
+                                for(int i=2+3;i<12;i+=3) this->values[i]=this->values[2];
+                        }
+                        else{
+                                for(int i=0;i<9;i+=3) this->values[i]=this->values[9];
+                                for(int i=1;i<9;i+=3) this->values[i]=this->values[10];
+                                for(int i=2;i<9;i+=3) this->values[i]=this->values[11];
+                        }
+                        break;
                 default:
                         _error_("not supported yet for type "<<EnumToStringx(this->interpolation_type));