CHG: better handling of melt perturbation using macro

Author: MathieuMorlighem

src/c/analyses/MasstransportAnalysis.cpp

@@ -6,6 +6,7 @@
 #include "../classes/Inputs/TransientInput.h"
 
 #define FINITEELEMENT P1Enum
+//#define MELTPERTURBATION
 
 /*Model processing*/
 void MasstransportAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
@@ -668,7 +669,9 @@ ElementVector* MasstransportAnalysis::CreatePVectorCG(Element* element){/*{{{*/
 
 	Input* gmb_input        = element->GetInput(BasalforcingsGroundediceMeltingRateEnum);  _assert_(gmb_input);
 	Input* fmb_input        = element->GetInput(BasalforcingsFloatingiceMeltingRateEnum);  _assert_(fmb_input);
-	//Input* fmb_pert_input   = element->GetInput(BasalforcingsPerturbationMeltingRateEnum); _assert_(fmb_pert_input);
+	#ifdef MELTPERTURBATION
+	Input* fmb_pert_input   = element->GetInput(BasalforcingsPerturbationMeltingRateEnum); _assert_(fmb_pert_input);
+	#endif
 	Input* gllevelset_input = element->GetInput(MaskOceanLevelsetEnum);              _assert_(gllevelset_input);
 	Input* ms_input         = element->GetInput(SmbMassBalanceEnum);                       _assert_(ms_input);
 	Input* thickness_input  = element->GetInput(ThicknessEnum);                            _assert_(thickness_input);
@@ -700,7 +703,9 @@ ElementVector* MasstransportAnalysis::CreatePVectorCG(Element* element){/*{{{*/
 		ms_input->GetInputValue(&ms,gauss);
 		gmb_input->GetInputValue(&gmb,gauss);
 		fmb_input->GetInputValue(&fmb,gauss);
-		//fmb_pert_input->GetInputValue(&fmb_pert,gauss);
+		#ifdef MELTPERTURBATION
+		fmb_pert_input->GetInputValue(&fmb_pert,gauss);
+		#endif
 		gllevelset_input->GetInputValue(&gllevelset,gauss);
 		thickness_input->GetInputValue(&thickness,gauss);
 
@@ -714,7 +719,10 @@ ElementVector* MasstransportAnalysis::CreatePVectorCG(Element* element){/*{{{*/
 		}
 		else if(melt_style==NoMeltOnPartiallyFloatingEnum){
 			if (phi<0.00000001){
-				mb=fmb;//+fmb_pert;
+				mb=fmb;
+				#ifdef MELTPERTURBATION
+				mb += +fmb_pert;
+				#endif
 			}
 			else mb=gmb;
 		}