Changeset 26825

Timestamp:

01/26/22 10:55:55 (3 years ago)

Author:

vverjans

Message:

CHG: added stochasticity to DeepwaterMeltingRate of spatiallinearbasalforcings

Location:

issm/trunk-jpl/src

Files:

• c/analyses/FreeSurfaceBaseAnalysis.cpp (modified) (1 diff)
• c/analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• c/analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• c/analyses/StressbalanceVerticalAnalysis.cpp (modified) (1 diff)
• c/modules/StochasticForcingx/StochasticForcingx.cpp (modified) (1 diff)
• c/shared/Enum/Enum.vim (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/Enumjl.vim (modified) (1 diff)
• m/classes/stochasticforcing.m (modified) (5 diffs)
• m/classes/stochasticforcing.py (modified) (5 diffs)

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

@@ -112 +112 @@
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.upperwater_melting_rate",BasalforcingsSpatialUpperwaterMeltingRateEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.upperwater_elevation",BasalforcingsSpatialUpperwaterElevationEnum);
+                        if(isstochastic){
+            iomodel->FetchDataToInput(inputs,elements,"md.stochasticforcing.default_id",StochasticForcingDefaultIdEnum);
+            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.deepwater_melting_rate",BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum);
+         }
                         break;
                 case BasalforcingsPicoEnum:

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

@@ -187 +187 @@
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.upperwater_elevation",BasalforcingsSpatialUpperwaterElevationEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.perturbation_melting_rate",BasalforcingsPerturbationMeltingRateEnum,0.);
+                        if(isstochastic){
+            iomodel->FetchDataToInput(inputs,elements,"md.stochasticforcing.default_id",StochasticForcingDefaultIdEnum);
+            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.deepwater_melting_rate",BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum);
+         }
                         break;
                 case BasalforcingsPicoEnum:

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

@@ -840 +840 @@
                                 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.upperwater_melting_rate",BasalforcingsSpatialUpperwaterMeltingRateEnum);
                                 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.upperwater_elevation",BasalforcingsSpatialUpperwaterElevationEnum);
+                                if(isstochastic){
+                                        iomodel->FetchDataToInput(inputs,elements,"md.stochasticforcing.default_id",StochasticForcingDefaultIdEnum);
+                                        iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.deepwater_melting_rate",BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum);
+                                }
                                 break;
                         case BasalforcingsPicoEnum:

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

@@ -143 +143 @@
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.upperwater_melting_rate",BasalforcingsSpatialUpperwaterMeltingRateEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.upperwater_elevation",BasalforcingsSpatialUpperwaterElevationEnum);
+                        if(isstochastic){
+            iomodel->FetchDataToInput(inputs,elements,"md.stochasticforcing.default_id",StochasticForcingDefaultIdEnum);
+            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.deepwater_melting_rate",BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum);
+         }
                         break;
                 case BasalforcingsPicoEnum:

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

@@ -100 +100 @@
                                         /*Already done above*/
                                         break;
+                                case BasalforcingsSpatialDeepwaterMeltingRateEnum:
+               /*Delete BasalforcingsSpatialDeepwaterMeltingRateEnum at previous time step (required if it is transient)*/
+               femmodel->inputs->DeleteInput(BasalforcingsSpatialDeepwaterMeltingRateEnum);
+               for(Object* &object:femmodel->elements->objects){
+                  Element* element = xDynamicCast<Element*>(object);
+                  int numvertices  = element->GetNumberOfVertices();
+                  IssmDouble baselinedeepwatermelt;
+                  IssmDouble deepwatermelt_tot[numvertices];
+                  Input* baselinedeepwatermelt_input  = NULL;
+                  baselinedeepwatermelt_input = element->GetInput(BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum); _assert_(baselinedeepwatermelt_input);
+                  element->GetInputValue(&dimensionid,StochasticForcingDefaultIdEnum);
+                  Gauss* gauss = element->NewGauss();
+                  for(int i=0;i<numvertices;i++){
+                     gauss->GaussVertex(i);
+                     baselinedeepwatermelt_input->GetInputValue(&baselinedeepwatermelt,gauss);
+                     deepwatermelt_tot[i] = baselinedeepwatermelt+noisefield[dimensionid];
+                  }
+                  element->AddInput(BasalforcingsSpatialDeepwaterMeltingRateEnum,&deepwatermelt_tot[0],P1DGEnum);
+                  delete gauss;
+               }
+               break;
                                 case DefaultCalvingEnum:
                                         /*Delete CalvingCalvingrateEnum at previous time step (required if it is transient)*/

issm/trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -621 +621 @@
 syn keyword cConstant BaseSlopeYEnum
 syn keyword cConstant BaselineBasalforcingsFloatingiceMeltingRateEnum
+syn keyword cConstant BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum
 syn keyword cConstant BaselineCalvingCalvingrateEnum
 syn keyword cConstant BaselineFrictionEffectivePressureEnum

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -617 +617 @@
         BaseSlopeYEnum,
         BaselineBasalforcingsFloatingiceMeltingRateEnum,
+        BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum,
         BaselineCalvingCalvingrateEnum,
         BaselineFrictionEffectivePressureEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -623 +623 @@
                 case BaseSlopeYEnum : return "BaseSlopeY";
                 case BaselineBasalforcingsFloatingiceMeltingRateEnum : return "BaselineBasalforcingsFloatingiceMeltingRate";
+                case BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum : return "BaselineBasalforcingsSpatialDeepwaterMeltingRate";
                 case BaselineCalvingCalvingrateEnum : return "BaselineCalvingCalvingrate";
                 case BaselineFrictionEffectivePressureEnum : return "BaselineFrictionEffectivePressure";

issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim

@@ -614 +614 @@
 syn keyword juliaConstC BaseSlopeYEnum
 syn keyword juliaConstC BaselineBasalforcingsFloatingiceMeltingRateEnum
+syn keyword juliaConstC BaselineBasalforcingsSpatialDeepwaterMeltingRateEnum
 syn keyword juliaConstC BaselineCalvingCalvingrateEnum
 syn keyword juliaConstC BaselineFrictionEffectivePressureEnum

issm/trunk-jpl/src/m/classes/stochasticforcing.m

@@ -78 +78 @@
                                         end
                                 end
+                                if(contains(field,'BasalforcingsSpatialDeepwaterMeltingRate'))
+                                        mdname = structstoch.mdnames(find(strcmp(structstoch.fields,char(field))));
+                                        if~(isequal(class(md.basalforcings),char(mdname)))
+                                                error('md.basalforcings does not agree with stochasticforcing field %s', char(field));
+                                        end
+                                end
                                 if(contains(field,'WaterPressure'))
                mdname = structstoch.mdnames(find(strcmp(structstoch.fields,char(field))));
@@ -127 +133 @@
                         disp(sprintf('   stochasticforcing parameters:'));
                         fielddisplay(self,'isstochasticforcing','is stochasticity activated?');
-                        fielddisplay(self,'fields','fields with stochasticity applied, ex: {''SMBautoregression''}, or {''FrontalForcingsRignotAutoregression''}');
+                        fielddisplay(self,'fields','fields with stochasticity applied, ex: [{''SMBautoregression''}], or [{''SMBforcing''},{''DefaultCalving''}]');
                         fielddisplay(self,'defaultdimension','dimensionality of the noise terms (does not apply to fields with their specific dimension)');
                         fielddisplay(self,'default_id','id of each element for partitioning of the noise terms (does not apply to fields with their specific partition)');
@@ -162 +168 @@
 
                                 %Scaling covariance matrix (scale column-by-column and row-by-row)
-                                scaledfields = {'DefaultCalving','FloatingMeltRate','SMBautoregression','SMBforcing'}; %list of fields that need scaling *1/yts
+                                scaledfields = {'BasalforcingsSpatialDeepwaterMeltingRate','DefaultCalving','FloatingMeltRate','SMBautoregression','SMBforcing'}; %list of fields that need scaling *1/yts
                                 tempcovariance = self.covariance; %copy of covariance to avoid writing back in member variable
                                 for i=1:num_fields
@@ -201 +207 @@
         % supported and corresponding md names
         structure.fields = {...
+                'BasalforcingsSpatialDeepwaterMeltingRate',...
                 'DefaultCalving',...
                 'FloatingMeltRate',...
@@ -209 +216 @@
                 };
         structure.mdnames = {...
+                'spatiallinearbasalforcings',...
                 'calving',...
                 'basalforcings',...

issm/trunk-jpl/src/m/classes/stochasticforcing.py

@@ -28 +28 @@
         s = '   stochasticforcing parameters:\n'
         s += '{}\n'.format(fielddisplay(self, 'isstochasticforcing', 'is stochasticity activated?'))
-        s += '{}\n'.format(fielddisplay(self, 'fields', 'fields with stochasticity applied, ex: [\'SMBautoregression\'], or [\'FrontalForcingsRignotAutoregression\']'))
+        s += '{}\n'.format(fielddisplay(self, 'fields', 'fields with stochasticity applied, ex: [\'SMBautoregression\'], or [\'SMBforcing\',\'DefaultCalving\']'))
         s += '{}\n'.format(fielddisplay(self, 'defaultdimension', 'dimensionality of the noise terms (does not apply to fields with their specific dimension)'))
         s += '{}\n'.format(fielddisplay(self, 'default_id', 'id of each element for partitioning of the noise terms (does not apply to fields with their specific partition)'))
@@ -34 +34 @@
         s += '{}\n'.format(fielddisplay(self, 'randomflag', 'whether to apply real randomness (true) or pseudo-randomness with fixed seed (false)'))
         s += 'Available fields:\n'
+        s += '   BasalforcingsSpatialDeepwaterMeltingRate\n'
         s += '   DefaultCalving\n'
         s += '   FloatingMeltRate\n'
+        s += '   FrictionWaterPressure\n'
+        s += '   FrontalForcingsRignotAutoregression (thermal forcing)\n'
         s += '   SMBautoregression\n'
-        s += '   FrontalForcingsRignotAutoregression (thermal forcing)\n'
+        s += '   SMBforcing\n'
         return s
     #}}}
@@ -84 +87 @@
                     raise TypeError('md.calving does not agree with stochasticforcing field {}'.format(field))
             if 'BasalforcingsFloatingice' in field:
+                mdname = structstoch[field]
+                if (type(md.basalforcings).__name__ != mdname):
+                    raise TypeError('md.basalforcings does not agree with stochasticforcing field {}'.format(field))
+            if 'BasalforcingsDpatialDeepwaterMeltingRate' in field:
                 mdname = structstoch[field]
                 if (type(md.basalforcings).__name__ != mdname):
@@ -148 +155 @@
 
             # Scaling covariance matrix (scale column-by-column and row-by-row)
-            scaledfields = ['DefaultCalving', 'FloatingMeltRate', 'SMBautoregression', 'SMBforcing']  # list of fields that need scaling * 1/yts
+            scaledfields = ['BasalforcingsSpatialDeepwaterMeltingRate','DefaultCalving', 'FloatingMeltRate', 'SMBautoregression', 'SMBforcing']  # list of fields that need scaling * 1/yts
             tempcovariance = np.copy(self.covariance)
             for i in range(num_fields):
@@ -184 +191 @@
            supported and corresponding md names
         """
-        structure = {'DefaultCalving': 'calving',
+        structure = {'BasalforcingsSpatialDeepwaterMeltingRate': 'spatiallinearbasalforcings',
+                     'DefaultCalving': 'calving',
                      'FloatingMeltRate': 'basalforcings',
                      'FrictionWaterPressure': 'friction',