Changeset 25777

Timestamp:

11/23/20 09:10:36 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixinf BckmannGoose

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/classes/Elements/Element.cpp (modified) (4 diffs)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• m/classes/basalforcingsbeckmanngoosse.m (modified) (5 diffs)
• m/contrib/morlighem/modeldata/interpSmith2020.m (modified) (1 diff)

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

@@ -114 +114 @@
                         break;
                 case BeckmannGoosseFloatingMeltRateEnum:
+                        iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.meltrate_factor",BasalforcingsMeltrateFactorEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_salinity",BasalforcingsOceanSalinityEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);

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

@@ -203 +203 @@
                         break;
                 case BeckmannGoosseFloatingMeltRateEnum:
+                        iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.meltrate_factor",BasalforcingsMeltrateFactorEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_salinity",BasalforcingsOceanSalinityEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);

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

@@ -818 +818 @@
                                 break;
                         case BeckmannGoosseFloatingMeltRateEnum:
+                                iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum);
                                 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_salinity",BasalforcingsOceanSalinityEnum);
                                 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);

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

@@ -141 +141 @@
                         break;
                 case BeckmannGoosseFloatingMeltRateEnum:
+                        iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.meltrate_factor",BasalforcingsMeltrateFactorEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_salinity",BasalforcingsOceanSalinityEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);

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

@@ -2373 +2373 @@
 
         int numvertices      = this->GetNumberOfVertices();
-        IssmDouble meltratefactor,T_f,ocean_heat_flux;
+        IssmDouble T_f,ocean_heat_flux;
         IssmDouble rho_water    = this->FindParam(MaterialsRhoSeawaterEnum);
         IssmDouble rho_ice      = this->FindParam(MaterialsRhoIceEnum);
@@ -2380 +2380 @@
         IssmDouble thermal_exchange_vel = this->FindParam(MaterialsThermalExchangeVelocityEnum);
 
-        IssmDouble* base    = xNew<IssmDouble>(numvertices);
-        IssmDouble* values  = xNew<IssmDouble>(numvertices);
-        IssmDouble* oceansalinity   = xNew<IssmDouble>(numvertices);
-        IssmDouble* oceantemp       = xNew<IssmDouble>(numvertices);
+        IssmDouble base[MAXVERTICES];
+        IssmDouble values[MAXVERTICES];
+        IssmDouble oceansalinity [MAXVERTICES];
+        IssmDouble oceantemp[MAXVERTICES];
+        IssmDouble meltratefactor[MAXVERTICES];
 
         this->GetInputListOnVertices(base,BaseEnum);
         this->GetInputListOnVertices(oceansalinity,BasalforcingsOceanSalinityEnum);
         this->GetInputListOnVertices(oceantemp,BasalforcingsOceanTempEnum);
-        parameters->FindParam(&meltratefactor,BasalforcingsMeltrateFactorEnum);
+        this->GetInputListOnVertices(meltratefactor,BasalforcingsMeltrateFactorEnum);
 
         Gauss* gauss=this->NewGauss();
@@ -2396 +2397 @@
                 // compute ocean_heat_flux according to beckmann_goosse2003
                 // positive, if T_oc > T_ice ==> heat flux FROM ocean TO ice
-                ocean_heat_flux = meltratefactor * rho_water * mixed_layer_capacity * thermal_exchange_vel * (oceantemp[i] - T_f); // in W/m^2
+                ocean_heat_flux = meltratefactor[i] * rho_water * mixed_layer_capacity * thermal_exchange_vel * (oceantemp[i] - T_f); // in W/m^2
 
                 // shelfbmassflux is positive if ice is freezing on; here it is always negative:
@@ -2404 +2405 @@
 
         this->AddInput(BasalforcingsFloatingiceMeltingRateEnum,values,P1Enum);
-        xDelete<IssmDouble>(base);
-        xDelete<IssmDouble>(values);
-        xDelete<IssmDouble>(oceantemp);
-        xDelete<IssmDouble>(oceansalinity);
         delete gauss;
 }/*}}}*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -245 +245 @@
                         break;
                 case BeckmannGoosseFloatingMeltRateEnum:
-                        parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.meltrate_factor",BasalforcingsMeltrateFactorEnum));
                         break;
                 default:

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

@@ -1 @@
-%MISMIP BASAL FORCINGS class definition
+%BECKMANNGOOSSE BASAL FORCINGS class definition
 %
 %   Usage:
@@ -8 +8 @@
                 groundedice_melting_rate  = NaN;
                 geothermalflux            = NaN;
-                meltrate_factor           = NaN;
-                ocean_temp                = NaN;
+                meltrate_factor           = 0.;
+                ocean_temp                = 0.;
                 ocean_salinity            = NaN;
         end
@@ -64 +64 @@
                                 md = checkfield(md,'fieldname','basalforcings.ocean_temp','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.ocean_salinity','NaN',1,'Inf',1,'timeseries',1);  
-                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
                         end
                         if ismember('BalancethicknessAnalysis',analyses),
@@ -70 +70 @@
                                 md = checkfield(md,'fieldname','basalforcings.ocean_temp','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.ocean_salinity','NaN',1,'Inf',1,'timeseries',1);
-                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
                         end
                         if ismember('ThermalAnalysis',analyses) & ~(solution=='TransientSolution' & md.transient.isthermal==0),
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
-                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0);
+                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
                         end
                 end % }}}
@@ -98 +98 @@
 
 
-WriteData(fid,prefix,'name','md.basalforcings.model','data',8,'format','Integer');
+                        WriteData(fid,prefix,'name','md.basalforcings.model','data',8,'format','Integer');
                         WriteData(fid,prefix,'data',floatingice_melting_rate,'format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','name','md.basalforcings.groundedice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
                         WriteData(fid,prefix,'object',self,'fieldname','geothermalflux','name','md.basalforcings.geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
-                        WriteData(fid,prefix,'object',self,'fieldname','meltrate_factor','format','Double','name','md.basalforcings.meltrate_factor');
+                        WriteData(fid,prefix,'object',self,'fieldname','meltrate_factor','format','DoubleMat','mattype',1,'name','md.basalforcings.meltrate_factor');
                         WriteData(fid,prefix,'object',self,'fieldname','ocean_temp','format','DoubleMat','name','md.basalforcings.ocean_temp','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
                         WriteData(fid,prefix,'object',self,'fieldname','ocean_salinity','format','DoubleMat','name','md.basalforcings.ocean_salinity','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);

issm/trunk-jpl/src/m/contrib/morlighem/modeldata/interpSmith2020.m

@@ -4 +4 @@
 %       Available data:
 %               Filtered mass-change maps, for display only, units of m(ice-equivalent)/yr:
-%               ais_floating_filt.tif
-%               ais_grounded_filt.tif
-%               gris_filt.tif
-
+%               ais_floating_filt
+%               ais_grounded_filt
+%               gris_filt
+%
 %               Raw mass-change maps, suitable for generation of basin-by-basin mass-change estimates, units of m(ice-equivalent)/yr:
-%               ais_floating.tif
-%               ais_grounded.tif
-%               gris.tif
+%               ais_floating
+%               ais_grounded
+%               gris
 %
 %   Usage: