Changeset 18093 for issm/trunk-jpl/src

Timestamp:

06/03/14 14:59:43 (11 years ago)

Author:

seroussi

Message:

BEW: adding new class for floating ice melt rate

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/classes/Elements/Element.cpp (modified) (1 diff)
• c/classes/Elements/Element.h (modified) (1 diff)
• c/modules/FloatingiceMeltingRatex (added)
• c/modules/FloatingiceMeltingRatex/.deps (added)
• c/modules/FloatingiceMeltingRatex/.deps/.dirstamp (added)
• c/modules/FloatingiceMeltingRatex/.deps/FloatingiceMeltingRatex.Plo (added)
• c/modules/FloatingiceMeltingRatex/.deps/libISSMCore_a-FloatingiceMeltingRatex.Po (added)
• c/modules/FloatingiceMeltingRatex/.deps/libISSMRose_a-FloatingiceMeltingRatex.r2cpp.Po (added)
• c/modules/FloatingiceMeltingRatex/.dirstamp (added)
• c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (added)
• c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h (added)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• c/modules/modules.h (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• c/shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• c/shared/Enum/StringToEnumx.cpp (modified) (7 diffs)
• m/classes/basalforcings.m (modified) (1 diff)
• m/classes/basalforcings.py (modified) (1 diff)
• m/classes/linearbasalforcings.m (added)
• m/enum/BasalforcingsDeepwaterElevationEnum.m (added)
• m/enum/BasalforcingsDeepwaterMeltingRateEnum.m (added)
• m/enum/BasalforcingsEnum.m (added)
• m/enum/BasalforcingsUpperwaterElevationEnum.m (added)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/FloatingMeltRateEnum.m (added)
• m/enum/LinearFloatingMeltRateEnum.m (added)

issm/trunk-jpl/src/c/Makefile.am

@@ -317 +317 @@
                                         ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h\
                                         ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp\
+                                        ./modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h\
+                                        ./modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp\
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.h\
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\

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

@@ -892 +892 @@
 }
 /*}}}*/
+void       Element::LinearFloatingiceMeltingRate(){/*{{{*/
+
+        int numvertices      = this->GetNumberOfVertices();
+        IssmDouble  deepwaterel,upperwaterel,deepwatermelt;
+        IssmDouble* base     = xNew<IssmDouble>(numvertices);
+        IssmDouble* values   = xNew<IssmDouble>(numvertices);
+
+        parameters->FindParam(&deepwaterel,BasalforcingsDeepwaterElevationEnum);
+        parameters->FindParam(&upperwaterel,BasalforcingsUpperwaterElevationEnum);
+        parameters->FindParam(&deepwatermelt,BasalforcingsDeepwaterMeltingRateEnum);
+
+        this->GetInputListOnVertices(base,BaseEnum);
+        for(int i=0;i<numvertices;i++){
+                if(base[i]>upperwaterel)      values[i]=0;
+                else if (base[i]<deepwaterel) values[i]=deepwatermelt;
+                else values[i]=deepwatermelt*(base[i]-upperwaterel)/(deepwaterel-upperwaterel);
+        }
+
+        this->AddInput(BasalforcingsFloatingiceMeltingRateEnum,values,P1Enum);
+
+}/*}}}*/
 ElementVector* Element::NewElementVector(int approximation_enum){/*{{{*/
         return new ElementVector(nodes,this->GetNumberOfNodes(),this->parameters,approximation_enum);

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

@@ -113 +113 @@
                 bool         IsInput(int name);
                 bool       IsFloating(); 
+                void       LinearFloatingiceMeltingRate(); 
                 ElementVector*  NewElementVector(int approximation_enum=NoneApproximationEnum);
                 ElementMatrix*  NewElementMatrix(int approximation_enum=NoneApproximationEnum);

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

@@ -19 +19 @@
 
         int         i,j,m,k;
-        int         numoutputs,materialtype,smb_model;
+        int         numoutputs,materialtype,smb_model,basalforcing_model;
         char**      requestedoutputs = NULL;
         IssmDouble  time;
@@ -133 +133 @@
         }
 
+        /*Basal forcing parameters*/
+        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsEnum));
+        iomodel->Constant(&basalforcing_model,BasalforcingsEnum);
+        switch(basalforcing_model){
+                case FloatingMeltRateEnum:
+                        /*Nothing to add to parameters*/
+                        break;
+                case LinearFloatingMeltRateEnum:
+                        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsDeepwaterMeltingRateEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsDeepwaterElevationEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsUpperwaterElevationEnum));
+                        break;
+                default:
+                        _error_("Basal forcing model "<<EnumToStringx(smb_model)<<" not supported yet");
+        }
+
         /*some parameters that did not come with the iomodel: */
         parameters->AddObject(new IntParam(SolutionTypeEnum,solution_type));

issm/trunk-jpl/src/c/modules/modules.h

@@ -54 +54 @@
 #include "./Kml2Expx/Kml2Expx.h"
 #include "./Krigingx/Krigingx.h"
+#include "./FloatingiceMeltingRatex/FloatingiceMeltingRatex.h"
 #include "./Mergesolutionfromftogx/Mergesolutionfromftogx.h"
 #include "./MeshPartitionx/MeshPartitionx.h"

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

@@ -38 +38 @@
         BalancethicknessStabilizationEnum,
         BalancethicknessThickeningRateEnum,
+        BasalforcingsEnum,
         BasalforcingsGeothermalfluxEnum,
         BasalforcingsGroundediceMeltingRateEnum,
@@ -44 +45 @@
         BasalforcingsDeepwaterElevationEnum,
         BasalforcingsUpperwaterElevationEnum,
+        FloatingMeltRateEnum,
+        LinearFloatingMeltRateEnum,
         BedEnum,
         BaseEnum,

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

@@ -46 +46 @@
                 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";
                 case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
+                case BasalforcingsEnum : return "Basalforcings";
                 case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
                 case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate";
@@ -52 +53 @@
                 case BasalforcingsDeepwaterElevationEnum : return "BasalforcingsDeepwaterElevation";
                 case BasalforcingsUpperwaterElevationEnum : return "BasalforcingsUpperwaterElevation";
+                case FloatingMeltRateEnum : return "FloatingMeltRate";
+                case LinearFloatingMeltRateEnum : return "LinearFloatingMeltRate";
                 case BedEnum : return "Bed";
                 case BaseEnum : return "Base";

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

@@ -46 +46 @@
               else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
               else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
+              else if (strcmp(name,"Basalforcings")==0) return BasalforcingsEnum;
               else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
               else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
@@ -52 +53 @@
               else if (strcmp(name,"BasalforcingsDeepwaterElevation")==0) return BasalforcingsDeepwaterElevationEnum;
               else if (strcmp(name,"BasalforcingsUpperwaterElevation")==0) return BasalforcingsUpperwaterElevationEnum;
+              else if (strcmp(name,"FloatingMeltRate")==0) return FloatingMeltRateEnum;
+              else if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
               else if (strcmp(name,"Bed")==0) return BedEnum;
               else if (strcmp(name,"Base")==0) return BaseEnum;
@@ -134 +137 @@
               else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
               else if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum;
-              else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
-              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
-              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
+              if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
+              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
+              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
+              else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
               else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
               else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
@@ -257 +260 @@
               else if (strcmp(name,"QmuMassFluxSegmentsPresent")==0) return QmuMassFluxSegmentsPresentEnum;
               else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
-              else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
-              else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
-              else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
+              if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
+              else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
+              else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
+              else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
               else if (strcmp(name,"QmuMaterialsRheologyB")==0) return QmuMaterialsRheologyBEnum;
               else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
@@ -380 +383 @@
               else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
               else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
-              else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
-              else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
-              else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
+              if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
+              else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
+              else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
+              else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
               else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
               else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
@@ -503 +506 @@
               else if (strcmp(name,"Friction")==0) return FrictionEnum;
               else if (strcmp(name,"Internal")==0) return InternalEnum;
-              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
-              else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
-              else if (strcmp(name,"Misfit")==0) return MisfitEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Pressure")==0) return PressureEnum;
+              if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
+              else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
+              else if (strcmp(name,"Misfit")==0) return MisfitEnum;
+              else if (strcmp(name,"Pressure")==0) return PressureEnum;
               else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
               else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
@@ -626 +629 @@
               else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
               else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
-              else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
-              else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
-              else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
+              if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
+              else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
+              else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
+              else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
               else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
               else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;

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

@@ -70 +70 @@
                         yts=365.0*24.0*3600.0;
 
+                        WriteData(fid,'enum',BasalforcingsEnum(),'data',FloatingMeltRateEnum(),'format','Integer');
                         WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
                         WriteData(fid,'object',obj,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)

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

@@ -66 +66 @@
                 yts=365.0*24.0*3600.0
 
+                WriteData(fid,'enum',BasalforcingsEnum(),'data',FloatingMeltRateEnum(),'format','Integer');
                 WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
                 WriteData(fid,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -38 +38 @@
 def BalancethicknessStabilizationEnum(): return StringToEnum("BalancethicknessStabilization")[0]
 def BalancethicknessThickeningRateEnum(): return StringToEnum("BalancethicknessThickeningRate")[0]
+def BasalforcingsEnum(): return StringToEnum("Basalforcings")[0]
 def BasalforcingsGeothermalfluxEnum(): return StringToEnum("BasalforcingsGeothermalflux")[0]
 def BasalforcingsGroundediceMeltingRateEnum(): return StringToEnum("BasalforcingsGroundediceMeltingRate")[0]
@@ -44 +45 @@
 def BasalforcingsDeepwaterElevationEnum(): return StringToEnum("BasalforcingsDeepwaterElevation")[0]
 def BasalforcingsUpperwaterElevationEnum(): return StringToEnum("BasalforcingsUpperwaterElevation")[0]
+def FloatingMeltRateEnum(): return StringToEnum("FloatingMeltRate")[0]
+def LinearFloatingMeltRateEnum(): return StringToEnum("LinearFloatingMeltRate")[0]
 def BedEnum(): return StringToEnum("Bed")[0]
 def BaseEnum(): return StringToEnum("Base")[0]