Changeset 22044

Timestamp:

09/05/17 14:33:52 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: sigma max can now be a vector (if necessary)

Location:

issm/trunk-jpl/src/c

Files:

• analyses/LevelsetAnalysis.cpp (modified) (2 diffs)
• classes/Elements/Penta.cpp (modified) (2 diffs)
• classes/Elements/Tria.cpp (modified) (2 diffs)

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

@@ -61 +61 @@
                         break;
                 case CalvingDevEnum:
+                        iomodel->FetchDataToInput(elements,"md.calving.stress_threshold_groundedice",CalvingStressThresholdGroundediceEnum);
+                        iomodel->FetchDataToInput(elements,"md.calving.stress_threshold_floatingice",CalvingStressThresholdFloatingiceEnum);
                         iomodel->FetchDataToInput(elements,"md.calving.meltingrate",CalvingMeltingrateEnum);
                         break;
@@ -80 +82 @@
                 case DefaultCalvingEnum:
                 case CalvingLevermannEnum:
-                        break;
                 case CalvingDevEnum:
-                        parameters->AddObject(iomodel->CopyConstantObject("md.calving.stress_threshold_groundedice",CalvingStressThresholdGroundediceEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.calving.stress_threshold_floatingice",CalvingStressThresholdFloatingiceEnum));
                         break;
                 case CalvingMinthicknessEnum:

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

@@ -207 +207 @@
         Input* vy_input = inputs->GetInput(VyAverageEnum); _assert_(vy_input);
         Input* gr_input = inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(gr_input);
+        Input* smax_fl_input = inputs->GetInput(CalvingStressThresholdFloatingiceEnum); _assert_(smax_fl_input);
+        Input* smax_gr_input = inputs->GetInput(CalvingStressThresholdGroundediceEnum); _assert_(smax_gr_input);
         IssmDouble  B   = this->GetMaterialParameter(MaterialsRheologyBbarEnum);
         IssmDouble  n   = this->GetMaterialParameter(MaterialsRheologyNEnum);
-        this->parameters->FindParam(&sigma_max_floating,CalvingStressThresholdFloatingiceEnum);
-        this->parameters->FindParam(&sigma_max_grounded,CalvingStressThresholdGroundediceEnum);
 
         /* Start looping on the number of vertices: */
@@ -221 +221 @@
                 vy_input->GetInputValue(&vy,gauss);
                 gr_input->GetInputValue(&groundedice,gauss);
+                smax_fl_input->GetInputValue(&sigma_max_floating,gauss);
+                smax_gr_input->GetInputValue(&sigma_max_grounded,gauss);
                 vel=sqrt(vx*vx+vy*vy)+1.e-14;
 

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

@@ -226 +226 @@
         Input* vy_input = inputs->GetInput(VyEnum); _assert_(vy_input);
         Input* gr_input = inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(gr_input);
+        Input* smax_fl_input = inputs->GetInput(CalvingStressThresholdFloatingiceEnum); _assert_(smax_fl_input);
+        Input* smax_gr_input = inputs->GetInput(CalvingStressThresholdGroundediceEnum); _assert_(smax_gr_input);
         IssmDouble  B   = this->GetMaterialParameter(MaterialsRheologyBbarEnum);
         IssmDouble  n   = this->GetMaterialParameter(MaterialsRheologyNEnum);
-        this->parameters->FindParam(&sigma_max_floating,CalvingStressThresholdFloatingiceEnum);
-        this->parameters->FindParam(&sigma_max_grounded,CalvingStressThresholdGroundediceEnum);
 
         /* Start looping on the number of vertices: */
@@ -240 +240 @@
                 vy_input->GetInputValue(&vy,gauss);
                 gr_input->GetInputValue(&groundedice,gauss);
+                smax_fl_input->GetInputValue(&sigma_max_floating,gauss);
+                smax_gr_input->GetInputValue(&sigma_max_grounded,gauss);
                 vel=sqrt(vx*vx+vy*vy)+1.e-14;