Changeset 21567

Timestamp:

02/17/17 15:45:55 (8 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

issm/branches/trunk-larour-GRL2017/src

Files:

• c/analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• c/cores/transient_core.cpp (modified) (3 diffs)
• m/plot/plot_contour.m (modified) (1 diff)

issm/branches/trunk-larour-GRL2017/src/c/analyses/MasstransportAnalysis.cpp

@@ -725 +725 @@
         element->AddBasalInput(ThicknessEnum,newthickness,P1Enum);
         element->AddBasalInput(SealevelriseDeltathicknessEnum,deltathickness,P1Enum);
+        element->AddBasalInput(EsaDeltathicknessEnum,deltathickness,P1Enum);
         element->AddBasalInput(SurfaceEnum,newsurface,P1Enum);
         element->AddBasalInput(BaseEnum,newbase,P1Enum);

issm/branches/trunk-larour-GRL2017/src/c/cores/transient_core.cpp

@@ -21 +21 @@
         /*parameters: */
         IssmDouble finaltime,dt,yts;
-        bool       isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology;
+        bool       isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,isesa,iscoupler,ismovingfront,isdamageevolution,ishydrology;
         bool       save_results,dakota_analysis;
         bool       time_adapt;
@@ -61 +61 @@
         femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum);
         femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
+        femmodel->parameters->FindParam(&isesa,TransientIsesaEnum);
         if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
         femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
@@ -142 +143 @@
                 if(isslr | iscoupler) sealevelrise_core(femmodel);
 
+                /*Elasto-static adjustment: */
+                if(isesa)esa_core(femmodel);
+
                 /*unload results*/
                 if(VerboseSolution()) _printf0_("   computing requested outputs\n");

issm/branches/trunk-larour-GRL2017/src/m/plot/plot_contour.m

@@ -269 +269 @@
         else
                 %clabel(c,h,'color',color,'FontSize',10,'labelspacing',20000);
-                clabel(c,h,'FontSize',10,'labelspacing',20000);
-        end
-end
+                %clabel(c,h,'FontSize',10,'labelspacing',20000);
+        end
+end