Changeset 27165 for issm/trunk-jpl/src/c/modules/StochasticForcingx/StochasticForcingx.cpp

Timestamp:

07/28/22 08:11:55 (3 years ago)

Author:

vverjans

Message:

CHG: allowing stochastic water pressure for frictioncoulomb

File:

• issm/trunk-jpl/src/c/modules/StochasticForcingx/StochasticForcingx.cpp (modified) (3 diffs)

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

@@ -207 +207 @@
                                                         gauss->GaussVertex(i);
                                                         p_water_deterministic[i] = friction->SubglacialWaterPressure(gauss);
-                                                        p_water[i]               = p_water_deterministic[i] + noisefield[dimensionid]; //make sure positive (29Nov2021)
+                                                        p_water[i]               = p_water_deterministic[i] + noisefield[dimensionid]; 
                                                 }
                                                 element->AddInput(FrictionWaterPressureEnum,p_water,P1DGEnum);
@@ -228 +228 @@
                                                         gauss->GaussVertex(i);
                                                         p_water_deterministic[i] = friction->SubglacialWaterPressure(gauss);
-                                                        p_water[i]               = p_water_deterministic[i] + noisefield[dimensionid]; //make sure positive (29Nov2021)
+                                                        p_water[i]               = p_water_deterministic[i] + noisefield[dimensionid]; 
                                                 }
                                                 element->AddInput(FrictionSchoofWaterPressureEnum,p_water,P1DGEnum);
@@ -234 +234 @@
                                                 delete friction;
                                         }
-                                        break;                          default:
+                                        break;
+                                case FrictionCoulombWaterPressureEnum:
+                                        /*Specify that WaterPressure is stochastic*/ 
+                                        femmodel->parameters->SetParam(true,StochasticForcingIsWaterPressureEnum);
+                                        for(Object* &object:femmodel->elements->objects){
+                  Element* element = xDynamicCast<Element*>(object);
+                  int numvertices  = element->GetNumberOfVertices();
+                  IssmDouble p_water_deterministic[numvertices];
+                  IssmDouble p_water[numvertices];
+                                                element->GetInputValue(&dimensionid,StochasticForcingDefaultIdEnum);
+                                                Gauss* gauss=element->NewGauss();
+                                                Friction* friction = new Friction(element);
+                                                for(int i=0;i<numvertices;i++){
+                                                        gauss->GaussVertex(i);
+                                                        p_water_deterministic[i] = friction->SubglacialWaterPressure(gauss);
+                                                        p_water[i]               = p_water_deterministic[i] + noisefield[dimensionid]; 
+                                                }
+                                                element->AddInput(FrictionCoulombWaterPressureEnum,p_water,P1DGEnum);
+                                                delete gauss;
+                                                delete friction;
+                                        }
+                                        break;
+                                default:
                                         _error_("Field "<<EnumToStringx(fields[j])<<" does not support stochasticity yet.");
                         }