Changeset 20209


Ignore:
Timestamp:
02/18/16 11:57:08 (9 years ago)
Author:
seroussi
Message:

NEW: starting to implement TotalFloatingBmb and TotalGroundedBmb outputs

Location:
issm/trunk-jpl
Files:
2 added
23 edited

Legend:

Unmodified
Added
Removed

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

    r20020 r20209  
    286286                virtual int        TensorInterpolation()=0;
    287287                virtual IssmDouble TimeAdapt()=0;
     288                virtual IssmDouble TotalFloatingBmb(void)=0;
     289                virtual IssmDouble TotalGroundedBmb(void)=0;
    288290                virtual IssmDouble TotalSmb(void)=0;
    289291                virtual void       Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finite_element)=0;

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

    r19764 r20209  
    26362636        return dt;
    26372637}/*}}}*/
     2638IssmDouble Penta::TotalFloatingBmb(void){/*{{{*/
     2639
     2640        /*The fbmb[Gt yr-1] of one element is area[m2] * floating basal melt [ m ice yr^-1] * rho_ice [kg m-3] / 1e+10^12 */
     2641        IssmDouble base,fbmb,rho_ice;
     2642        IssmDouble Total_Fbmb=0;
     2643        IssmDouble xyz_list[NUMVERTICES][3];
     2644
     2645        /*Get material parameters :*/
     2646        rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
     2647
     2648        if(!IsIceInElement() || !IsOnBase()) return 0.;
     2649
     2650        ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
     2651
     2652        /*First calculate the area of the base (cross section triangle)
     2653         * http://en.wikipedia.org/wiki/Triangle
     2654         * base = 1/2 abs((xA-xC)(yB-yA)-(xA-xB)(yC-yA))*/
     2655        base = 1./2. * fabs((xyz_list[0][0]-xyz_list[2][0])*(xyz_list[1][1]-xyz_list[0][1]) - (xyz_list[0][0]-xyz_list[1][0])*(xyz_list[2][1]-xyz_list[0][1]));
     2656
     2657        /*Now get the average Floating melt rate over the element*/
     2658        Input* fbmb_input = inputs->GetInput(BasalforcingsFloatingiceMeltingRateEnum); _assert_(fbmb_input);
     2659
     2660        fbmb_input->GetInputAverage(&fbmb);
     2661        Total_Fbmb=rho_ice*base*fbmb;// floating melt rate on element in kg s-1
     2662
     2663        /*Return: */
     2664        return Total_Fbmb;
     2665}
     2666/*}}}*/
     2667IssmDouble Penta::TotalGroundedBmb(void){/*{{{*/
     2668
     2669        /*The grounded ice melting rate [Gt yr-1] of one element is area[m2] * grounded melt [ m ice yr^-1] * rho_ice [kg m-3] / 1e+10^12 */
     2670        IssmDouble base,gbmb,rho_ice;
     2671        IssmDouble Total_Gbmb=0;
     2672        IssmDouble xyz_list[NUMVERTICES][3];
     2673
     2674        /*Get material parameters :*/
     2675        rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
     2676
     2677        if(!IsIceInElement() || !IsOnBase()) return 0.;
     2678
     2679        ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
     2680
     2681        /*First calculate the area of the base (cross section triangle)
     2682         * http://en.wikipedia.org/wiki/Triangle
     2683         * base = 1/2 abs((xA-xC)(yB-yA)-(xA-xB)(yC-yA))*/
     2684        base = 1./2. * fabs((xyz_list[0][0]-xyz_list[2][0])*(xyz_list[1][1]-xyz_list[0][1]) - (xyz_list[0][0]-xyz_list[1][0])*(xyz_list[2][1]-xyz_list[0][1]));
     2685
     2686        /*Now get the average grounded melt over the element*/
     2687        Input* gbmb_input = inputs->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(gbmb_input);
     2688
     2689        gbmb_input->GetInputAverage(&gbmb);
     2690        Total_Gbmb=rho_ice*base*gbmb;// grounded melt on element in kg s-1
     2691
     2692        /*Return: */
     2693        return Total_Gbmb;
     2694}
     2695/*}}}*/
    26382696IssmDouble Penta::TotalSmb(void){/*{{{*/
    26392697

  • issm/trunk-jpl/src/c/classes/Elements/Penta.h

    r20007 r20209  
    159159                int            TensorInterpolation(){_error_("not implemented yet");};
    160160                IssmDouble     TimeAdapt();
     161                IssmDouble     TotalFloatingBmb(void);
     162                IssmDouble     TotalGroundedBmb(void);
    161163                IssmDouble     TotalSmb(void);
    162164                void           Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement);

  • issm/trunk-jpl/src/c/classes/Elements/Seg.h

    r20007 r20209  
    149149                int         TensorInterpolation(void){_error_("not implemented yet");};
    150150                IssmDouble  TimeAdapt(){_error_("not implemented yet");};
     151                IssmDouble  TotalFloatingBmb(void){_error_("not implemented yet");};
     152                IssmDouble  TotalGroundedBmb(void){_error_("not implemented yet");};
    151153                IssmDouble  TotalSmb(void){_error_("not implemented yet");};
    152154                void        Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/classes/Elements/Tetra.h

    r20007 r20209  
    156156                int         TensorInterpolation(void);
    157157                IssmDouble  TimeAdapt(){_error_("not implemented yet");};
     158                IssmDouble  TotalFloatingBmb(void){_error_("not implemented yet");};
     159                IssmDouble  TotalGroundedBmb(void){_error_("not implemented yet");};
    158160                IssmDouble  TotalSmb(void){_error_("not implemented yet");};
    159161                void        Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement);

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

    r20053 r20209  
    30683068
    30693069        return dt;
     3070}
     3071/*}}}*/
     3072IssmDouble Tria::TotalFloatingBmb(void){/*{{{*/
     3073
     3074        /*The fbmb[kg yr-1] of one element is area[m2] * melting_rate [kg m^-2 yr^-1]*/
     3075        IssmDouble base,fbmb,rho_ice;
     3076        IssmDouble Total_Fbmb=0;
     3077        IssmDouble xyz_list[NUMVERTICES][3];
     3078
     3079        /*Get material parameters :*/
     3080        rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
     3081
     3082   if(!IsIceInElement())return 0;
     3083
     3084        ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
     3085
     3086        /*First calculate the area of the base (cross section triangle)
     3087         * http://en.wikipedia.org/wiki/Triangle
     3088         * base = 1/2 abs((xA-xC)(yB-yA)-(xA-xB)(yC-yA))*/
     3089        base = 1./2. * fabs((xyz_list[0][0]-xyz_list[2][0])*(xyz_list[1][1]-xyz_list[0][1]) - (xyz_list[0][0]-xyz_list[1][0])*(xyz_list[2][1]-xyz_list[0][1])); // area of element in m2
     3090
     3091        /*Now get the average SMB over the element*/
     3092        Input* fbmb_input = inputs->GetInput(BasalforcingsFloatingiceMeltingRateEnum); _assert_(fbmb_input);
     3093        fbmb_input->GetInputAverage(&fbmb);                                                                                                                                                                                             // average melting rate on element in m ice s-1
     3094   Total_Fbmb=rho_ice*base*fbmb;                                                                                                                                                                                                                        // melting rate on element in kg s-1
     3095
     3096        /*Return: */
     3097        return Total_Fbmb;
     3098}
     3099/*}}}*/
     3100IssmDouble Tria::TotalGroundedBmb(void){/*{{{*/
     3101
     3102        /*The gbmb[kg yr-1] of one element is area[m2] * gounded melting rate [kg m^-2 yr^-1]*/
     3103        IssmDouble base,gbmb,rho_ice;
     3104        IssmDouble Total_Gbmb=0;
     3105        IssmDouble xyz_list[NUMVERTICES][3];
     3106
     3107        /*Get material parameters :*/
     3108        rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
     3109
     3110   if(!IsIceInElement())return 0;
     3111
     3112        ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
     3113
     3114        /*First calculate the area of the base (cross section triangle)
     3115         * http://en.wikipedia.org/wiki/Triangle
     3116         * base = 1/2 abs((xA-xC)(yB-yA)-(xA-xB)(yC-yA))*/
     3117        base = 1./2. * fabs((xyz_list[0][0]-xyz_list[2][0])*(xyz_list[1][1]-xyz_list[0][1]) - (xyz_list[0][0]-xyz_list[1][0])*(xyz_list[2][1]-xyz_list[0][1])); // area of element in m2
     3118
     3119        /*Now get the average grounded melting rate over the element*/
     3120        Input* gbmb_input = inputs->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(gbmb_input);
     3121        gbmb_input->GetInputAverage(&gbmb);                                                                                                                                                                                             // average smb on element in m ice s-1
     3122   Total_Gbmb=rho_ice*base*gbmb;                                                                                                                                                                                                                        // smb on element in kg s-1
     3123
     3124        /*Return: */
     3125        return Total_Gbmb;
    30703126}
    30713127/*}}}*/

  • issm/trunk-jpl/src/c/classes/Elements/Tria.h

    r20007 r20209  
    130130                int         TensorInterpolation();
    131131                IssmDouble  TimeAdapt();
     132                IssmDouble  TotalFloatingBmb(void);
     133                IssmDouble  TotalGroundedBmb(void);
    132134                IssmDouble  TotalSmb(void);
    133135                void        Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement);

  • issm/trunk-jpl/src/c/classes/FemModel.cpp

    r20134 r20209  
    952952                case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(responses, elements,nodes, vertices, loads, materials, parameters); break;
    953953                case BalancethicknessMisfitEnum:   BalancethicknessMisfitx(responses); break;
     954                case TotalFloatingBmbEnum:                        this->TotalFloatingBmbx(responses); break;
     955                case TotalGroundedBmbEnum:                        this->TotalGroundedBmbx(responses); break;
    954956                case TotalSmbEnum:                                        this->TotalSmbx(responses); break;
    955957                case MaterialsRheologyBbarEnum:    this->ElementResponsex(responses,MaterialsRheologyBbarEnum); break;
    … …  
    10261028                                        case MaxAbsVzEnum:                 this->MaxAbsVzx(&double_result);                 break;
    10271029                                        case MassFluxEnum:                 this->MassFluxx(&double_result);                 break;
     1030                                        case TotalFloatingBmbEnum:         this->TotalFloatingBmbx(&double_result);         break;
     1031                                        case TotalGroundedBmbEnum:         this->TotalGroundedBmbx(&double_result);         break;
    10281032                                        case TotalSmbEnum:                 this->TotalSmbx(&double_result);                 break;
    10291033
    … …  
    15701574
    15711575}/*}}}*/
     1576void FemModel::TotalFloatingBmbx(IssmDouble* pFbmb){/*{{{*/
     1577
     1578        IssmDouble local_fbmb = 0;
     1579        IssmDouble total_fbmb;
     1580
     1581        for(int i=0;i<this->elements->Size();i++){
     1582                Element* element=xDynamicCast<Element*>(this->elements->GetObjectByOffset(i));
     1583                local_fbmb+=element->TotalFloatingBmb();
     1584        }
     1585        ISSM_MPI_Reduce(&local_fbmb,&total_fbmb,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
     1586        ISSM_MPI_Bcast(&total_fbmb,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
     1587
     1588        /*Assign output pointers: */
     1589        *pFbmb=total_fbmb;
     1590
     1591}/*}}}*/
     1592void FemModel::TotalGroundedBmbx(IssmDouble* pGbmb){/*{{{*/
     1593
     1594        IssmDouble local_gbmb = 0;
     1595        IssmDouble total_gbmb;
     1596
     1597        for(int i=0;i<this->elements->Size();i++){
     1598                Element* element=xDynamicCast<Element*>(this->elements->GetObjectByOffset(i));
     1599                local_gbmb+=element->TotalGroundedBmb();
     1600        }
     1601        ISSM_MPI_Reduce(&local_gbmb,&total_gbmb,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
     1602        ISSM_MPI_Bcast(&total_gbmb,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
     1603
     1604        /*Assign output pointers: */
     1605        *pGbmb=total_gbmb;
     1606
     1607}/*}}}*/
    15721608void FemModel::TotalSmbx(IssmDouble* pSmb){/*{{{*/
    15731609

  • issm/trunk-jpl/src/c/classes/FemModel.h

    r20134 r20209  
    7777                void MinVyx(IssmDouble* presponse);
    7878                void MinVzx(IssmDouble* presponse);
     79                void TotalFloatingBmbx(IssmDouble* pFbmb);
     80                void TotalGroundedBmbx(IssmDouble* pGbmb);
    7981                void TotalSmbx(IssmDouble* pSmb);
    8082                void Divergencex(IssmDouble* pdiv);

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

    r20154 r20209  
    944944        IceVolumeEnum,
    945945        IceVolumeAboveFloatationEnum,
     946        TotalFloatingBmbEnum,
     947        TotalGroundedBmbEnum,
    946948        TotalSmbEnum,
    947949        /*}}}*/

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

    r20154 r20209  
    920920                case IceVolumeEnum : return "IceVolume";
    921921                case IceVolumeAboveFloatationEnum : return "IceVolumeAboveFloatation";
     922                case TotalFloatingBmbEnum : return "TotalFloatingBmb";
     923                case TotalGroundedBmbEnum : return "TotalGroundedBmb";
    922924                case TotalSmbEnum : return "TotalSmb";
    923925                case AbsoluteEnum : return "Absolute";

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

    r20154 r20209  
    941941              else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
    942942              else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
     943              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
     944              else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
    943945              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
    944946              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    … …  
    996998              else if (strcmp(name,"Sset")==0) return SsetEnum;
    997999              else if (strcmp(name,"Verbose")==0) return VerboseEnum;
    998               else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
    999               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
     1003              if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
     1004              else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
     1005              else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
    10041006              else if (strcmp(name,"XY")==0) return XYEnum;
    10051007              else if (strcmp(name,"XYZ")==0) return XYZEnum;

  • issm/trunk-jpl/src/m/enum/EnumDefinitions.js

    r20154 r20209  
    905905function IceVolumeEnum(){ return 901;}
    906906function IceVolumeAboveFloatationEnum(){ return 902;}
    907 function TotalSmbEnum(){ return 903;}
    908 function AbsoluteEnum(){ return 904;}
    909 function IncrementalEnum(){ return 905;}
    910 function AugmentedLagrangianREnum(){ return 906;}
    911 function AugmentedLagrangianRhopEnum(){ return 907;}
    912 function AugmentedLagrangianRlambdaEnum(){ return 908;}
    913 function AugmentedLagrangianRholambdaEnum(){ return 909;}
    914 function AugmentedLagrangianThetaEnum(){ return 910;}
    915 function NoneEnum(){ return 911;}
    916 function AggressiveMigrationEnum(){ return 912;}
    917 function SoftMigrationEnum(){ return 913;}
    918 function SubelementMigrationEnum(){ return 914;}
    919 function SubelementMigration2Enum(){ return 915;}
    920 function ContactEnum(){ return 916;}
    921 function GroundingOnlyEnum(){ return 917;}
    922 function MaskGroundediceLevelsetEnum(){ return 918;}
    923 function GaussSegEnum(){ return 919;}
    924 function GaussTriaEnum(){ return 920;}
    925 function GaussTetraEnum(){ return 921;}
    926 function GaussPentaEnum(){ return 922;}
    927 function FSSolverEnum(){ return 923;}
    928 function AdjointEnum(){ return 924;}
    929 function ColinearEnum(){ return 925;}
    930 function ControlSteadyEnum(){ return 926;}
    931 function FsetEnum(){ return 927;}
    932 function Gradient1Enum(){ return 928;}
    933 function Gradient2Enum(){ return 929;}
    934 function Gradient3Enum(){ return 930;}
    935 function GradientEnum(){ return 931;}
    936 function GroundinglineMigrationEnum(){ return 932;}
    937 function GsetEnum(){ return 933;}
    938 function IndexEnum(){ return 934;}
    939 function IndexedEnum(){ return 935;}
    940 function IntersectEnum(){ return 936;}
    941 function NodalEnum(){ return 937;}
    942 function OldGradientEnum(){ return 938;}
    943 function OutputBufferPointerEnum(){ return 939;}
    944 function OutputBufferSizePointerEnum(){ return 940;}
    945 function OutputFilePointerEnum(){ return 941;}
    946 function ToolkitsFileNameEnum(){ return 942;}
    947 function RootPathEnum(){ return 943;}
    948 function OutputFileNameEnum(){ return 944;}
    949 function InputFileNameEnum(){ return 945;}
    950 function LockFileNameEnum(){ return 946;}
    951 function RestartFileNameEnum(){ return 947;}
    952 function ToolkitsOptionsAnalysesEnum(){ return 948;}
    953 function ToolkitsOptionsStringsEnum(){ return 949;}
    954 function QmuErrNameEnum(){ return 950;}
    955 function QmuInNameEnum(){ return 951;}
    956 function QmuOutNameEnum(){ return 952;}
    957 function RegularEnum(){ return 953;}
    958 function ScaledEnum(){ return 954;}
    959 function SeparateEnum(){ return 955;}
    960 function SsetEnum(){ return 956;}
    961 function VerboseEnum(){ return 957;}
    962 function TriangleInterpEnum(){ return 958;}
    963 function BilinearInterpEnum(){ return 959;}
    964 function NearestInterpEnum(){ return 960;}
    965 function XYEnum(){ return 961;}
    966 function XYZEnum(){ return 962;}
    967 function DenseEnum(){ return 963;}
    968 function MpiDenseEnum(){ return 964;}
    969 function MpiSparseEnum(){ return 965;}
    970 function SeqEnum(){ return 966;}
    971 function MpiEnum(){ return 967;}
    972 function MumpsEnum(){ return 968;}
    973 function GslEnum(){ return 969;}
    974 function OptionEnum(){ return 970;}
    975 function GenericOptionEnum(){ return 971;}
    976 function OptionCellEnum(){ return 972;}
    977 function OptionStructEnum(){ return 973;}
    978 function CuffeyEnum(){ return 974;}
    979 function PatersonEnum(){ return 975;}
    980 function ArrheniusEnum(){ return 976;}
    981 function LliboutryDuvalEnum(){ return 977;}
    982 function TransientIslevelsetEnum(){ return 978;}
    983 function SpcLevelsetEnum(){ return 979;}
    984 function ExtrapolationVariableEnum(){ return 980;}
    985 function IceMaskNodeActivationEnum(){ return 981;}
    986 function LevelsetfunctionSlopeXEnum(){ return 982;}
    987 function LevelsetfunctionSlopeYEnum(){ return 983;}
    988 function LevelsetfunctionPicardEnum(){ return 984;}
    989 function SealevelriseSolutionEnum(){ return 985;}
    990 function SealevelriseAnalysisEnum(){ return 986;}
    991 function SealevelEnum(){ return 987;}
    992 function SealevelriseDeltathicknessEnum(){ return 988;}
    993 function SealevelriseMaxiterEnum(){ return 989;}
    994 function SealevelriseReltolEnum(){ return 990;}
    995 function SealevelriseAbstolEnum(){ return 991;}
    996 function SealevelriseLoveHEnum(){ return 992;}
    997 function SealevelriseLoveKEnum(){ return 993;}
    998 function SealevelriseRigidEnum(){ return 994;}
    999 function SealevelriseElasticEnum(){ return 995;}
    1000 function SealevelriseEustaticEnum(){ return 996;}
    1001 function SealevelriseGElasticEnum(){ return 997;}
    1002 function SealevelriseDegaccEnum(){ return 998;}
    1003 function SealevelriseTransitionsEnum(){ return 999;}
    1004 function SealevelriseRequestedOutputsEnum(){ return 1000;}
    1005 function SealevelriseNumRequestedOutputsEnum(){ return 1001;}
    1006 function MaximumNumberOfDefinitionsEnum(){ return 1002;}
     907function TotalFloatingBmbEnum(){ return 903;}
     908function TotalGroundedBmbEnum(){ return 904;}
     909function TotalSmbEnum(){ return 905;}
     910function AbsoluteEnum(){ return 906;}
     911function IncrementalEnum(){ return 907;}
     912function AugmentedLagrangianREnum(){ return 908;}
     913function AugmentedLagrangianRhopEnum(){ return 909;}
     914function AugmentedLagrangianRlambdaEnum(){ return 910;}
     915function AugmentedLagrangianRholambdaEnum(){ return 911;}
     916function AugmentedLagrangianThetaEnum(){ return 912;}
     917function NoneEnum(){ return 913;}
     918function AggressiveMigrationEnum(){ return 914;}
     919function SoftMigrationEnum(){ return 915;}
     920function SubelementMigrationEnum(){ return 916;}
     921function SubelementMigration2Enum(){ return 917;}
     922function ContactEnum(){ return 918;}
     923function GroundingOnlyEnum(){ return 919;}
     924function MaskGroundediceLevelsetEnum(){ return 920;}
     925function GaussSegEnum(){ return 921;}
     926function GaussTriaEnum(){ return 922;}
     927function GaussTetraEnum(){ return 923;}
     928function GaussPentaEnum(){ return 924;}
     929function FSSolverEnum(){ return 925;}
     930function AdjointEnum(){ return 926;}
     931function ColinearEnum(){ return 927;}
     932function ControlSteadyEnum(){ return 928;}
     933function FsetEnum(){ return 929;}
     934function Gradient1Enum(){ return 930;}
     935function Gradient2Enum(){ return 931;}
     936function Gradient3Enum(){ return 932;}
     937function GradientEnum(){ return 933;}
     938function GroundinglineMigrationEnum(){ return 934;}
     939function GsetEnum(){ return 935;}
     940function IndexEnum(){ return 936;}
     941function IndexedEnum(){ return 937;}
     942function IntersectEnum(){ return 938;}
     943function NodalEnum(){ return 939;}
     944function OldGradientEnum(){ return 940;}
     945function OutputBufferPointerEnum(){ return 941;}
     946function OutputBufferSizePointerEnum(){ return 942;}
     947function OutputFilePointerEnum(){ return 943;}
     948function ToolkitsFileNameEnum(){ return 944;}
     949function RootPathEnum(){ return 945;}
     950function OutputFileNameEnum(){ return 946;}
     951function InputFileNameEnum(){ return 947;}
     952function LockFileNameEnum(){ return 948;}
     953function RestartFileNameEnum(){ return 949;}
     954function ToolkitsOptionsAnalysesEnum(){ return 950;}
     955function ToolkitsOptionsStringsEnum(){ return 951;}
     956function QmuErrNameEnum(){ return 952;}
     957function QmuInNameEnum(){ return 953;}
     958function QmuOutNameEnum(){ return 954;}
     959function RegularEnum(){ return 955;}
     960function ScaledEnum(){ return 956;}
     961function SeparateEnum(){ return 957;}
     962function SsetEnum(){ return 958;}
     963function VerboseEnum(){ return 959;}
     964function TriangleInterpEnum(){ return 960;}
     965function BilinearInterpEnum(){ return 961;}
     966function NearestInterpEnum(){ return 962;}
     967function XYEnum(){ return 963;}
     968function XYZEnum(){ return 964;}
     969function DenseEnum(){ return 965;}
     970function MpiDenseEnum(){ return 966;}
     971function MpiSparseEnum(){ return 967;}
     972function SeqEnum(){ return 968;}
     973function MpiEnum(){ return 969;}
     974function MumpsEnum(){ return 970;}
     975function GslEnum(){ return 971;}
     976function OptionEnum(){ return 972;}
     977function GenericOptionEnum(){ return 973;}
     978function OptionCellEnum(){ return 974;}
     979function OptionStructEnum(){ return 975;}
     980function CuffeyEnum(){ return 976;}
     981function PatersonEnum(){ return 977;}
     982function ArrheniusEnum(){ return 978;}
     983function LliboutryDuvalEnum(){ return 979;}
     984function TransientIslevelsetEnum(){ return 980;}
     985function SpcLevelsetEnum(){ return 981;}
     986function ExtrapolationVariableEnum(){ return 982;}
     987function IceMaskNodeActivationEnum(){ return 983;}
     988function LevelsetfunctionSlopeXEnum(){ return 984;}
     989function LevelsetfunctionSlopeYEnum(){ return 985;}
     990function LevelsetfunctionPicardEnum(){ return 986;}
     991function SealevelriseSolutionEnum(){ return 987;}
     992function SealevelriseAnalysisEnum(){ return 988;}
     993function SealevelEnum(){ return 989;}
     994function SealevelriseDeltathicknessEnum(){ return 990;}
     995function SealevelriseMaxiterEnum(){ return 991;}
     996function SealevelriseReltolEnum(){ return 992;}
     997function SealevelriseAbstolEnum(){ return 993;}
     998function SealevelriseLoveHEnum(){ return 994;}
     999function SealevelriseLoveKEnum(){ return 995;}
     1000function SealevelriseRigidEnum(){ return 996;}
     1001function SealevelriseElasticEnum(){ return 997;}
     1002function SealevelriseEustaticEnum(){ return 998;}
     1003function SealevelriseGElasticEnum(){ return 999;}
     1004function SealevelriseDegaccEnum(){ return 1000;}
     1005function SealevelriseTransitionsEnum(){ return 1001;}
     1006function SealevelriseRequestedOutputsEnum(){ return 1002;}
     1007function SealevelriseNumRequestedOutputsEnum(){ return 1003;}
     1008function MaximumNumberOfDefinitionsEnum(){ return 1004;}

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

    r20154 r20209  
    912912def IceVolumeEnum(): return StringToEnum("IceVolume")[0]
    913913def IceVolumeAboveFloatationEnum(): return StringToEnum("IceVolumeAboveFloatation")[0]
     914def TotalFloatingBmbEnum(): return StringToEnum("TotalFloatingBmb")[0]
     915def TotalGroundedBmbEnum(): return StringToEnum("TotalGroundedBmb")[0]
    914916def TotalSmbEnum(): return StringToEnum("TotalSmb")[0]
    915917def AbsoluteEnum(): return StringToEnum("Absolute")[0]

  • issm/trunk-jpl/test/NightlyRun/test208.m

    r19756 r20209  
    55md=setflowequation(md,'SSA','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.transient.requested_outputs={'default','GroundedArea'};
     7md.transient.requested_outputs={'default','GroundedArea','TotalGroundedBmb','TotalFloatingBmb'};
    88md=solve(md,TransientSolutionEnum());
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'};
    12 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     11field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','TotalGroundedBmb1','TotalFloatingBmb1',...
     12        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','TotalGroundedBmb2','TotalFloatingBmb2',...
     13        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','TotalGroundedBmb3','TotalFloatingBmb3'};
     14field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     15        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     16        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1317field_values={...
    1418        (md.results.TransientSolution(1).Vx),...
    … …  
    1923        (md.results.TransientSolution(1).Surface),...
    2024        (md.results.TransientSolution(1).Thickness),...
     25        (md.results.TransientSolution(1).TotalGroundedBmb),...
     26        (md.results.TransientSolution(1).TotalFloatingBmb),...
    2127        (md.results.TransientSolution(2).Vx),...
    2228        (md.results.TransientSolution(2).Vy),...
    … …  
    2632        (md.results.TransientSolution(2).Surface),...
    2733        (md.results.TransientSolution(2).Thickness),...
     34        (md.results.TransientSolution(2).TotalGroundedBmb),...
     35        (md.results.TransientSolution(2).TotalFloatingBmb),...
    2836        (md.results.TransientSolution(3).Vx),...
    2937        (md.results.TransientSolution(3).Vy),...
    … …  
    3341        (md.results.TransientSolution(3).Surface),...
    3442        (md.results.TransientSolution(3).Thickness),...
     43        (md.results.TransientSolution(3).TotalGroundedBmb),...
     44        (md.results.TransientSolution(3).TotalFloatingBmb),...
    3545        };

  • issm/trunk-jpl/test/NightlyRun/test208.py

    r19049 r20209  
    1616md=setflowequation(md,'SSA','all')
    1717md.cluster=generic('name',oshostname(),'np',3)
     18md.transient.requested_outputs=['default','GroundedArea','TotalFloatingBmb','TotalGroundedBmb']
    1819md=solve(md,TransientSolutionEnum())
    1920
    … …  
    2122# Fields and tolerances to track changes
    2223
    23 field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3']
    24 field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
     24field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','TotalGroundedBmb1','TotalFloatingBmb1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','TotalGroundedBmb2','TotalFloatingBmb2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','TotalGroundedBmb3','TotalFloatingBmb3']
     25field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
    2526field_values=[\
    2627        md.results.TransientSolution[0].Vx,\
    … …  
    3132        md.results.TransientSolution[0].Surface,\
    3233        md.results.TransientSolution[0].Thickness,\
     34        md.results.TransientSolution[0].TotalGroundedBmb,\
     35        md.results.TransientSolution[0].TotalFloatingBmb,\
    3336        md.results.TransientSolution[1].Vx,\
    3437        md.results.TransientSolution[1].Vy,\
    … …  
    3841        md.results.TransientSolution[1].Surface,\
    3942        md.results.TransientSolution[1].Thickness,\
     43        md.results.TransientSolution[1].TotalGroundedBmb,\
     44        md.results.TransientSolution[1].TotalFloatingBmb,\
    4045        md.results.TransientSolution[2].Vx,\
    4146        md.results.TransientSolution[2].Vy,\
    … …  
    4550        md.results.TransientSolution[2].Surface,\
    4651        md.results.TransientSolution[2].Thickness,\
     52        md.results.TransientSolution[2].TotalGroundedBmb,\
     53        md.results.TransientSolution[2].TotalFloatingBmb,\
    4754        ]

  • issm/trunk-jpl/test/NightlyRun/test317.m

    r19764 r20209  
    66md=setflowequation(md,'HO','all');
    77md.cluster=generic('name',oshostname(),'np',3);
    8 md.transient.requested_outputs={'default','GroundedArea','FloatingArea'};
     8md.transient.requested_outputs={'default','GroundedArea','FloatingArea','TotalFloatingBmb','TotalGroundedBmb'};
    99md=solve(md,TransientSolutionEnum());
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1','FloatingArea1',...
    13         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2','FloatingArea2',...
    14         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3','FloatingArea3'};
    15 field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,...
    16         1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,...
    17         1e-09,5e-10,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1'...
     13        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2','FloatingArea2','TotalFloatingBmb2','TotalGroundedBmb2',...
     14        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3'};
     15field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12,...
     16        1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12,...
     17        1e-09,5e-10,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12};
    1818field_values={...
    1919        (md.results.TransientSolution(1).Vx),...
    … …  
    2929        (md.results.TransientSolution(1).GroundedArea),...
    3030        (md.results.TransientSolution(1).FloatingArea),...
     31        (md.results.TransientSolution(1).TotalFloatingBmb),...
     32        (md.results.TransientSolution(1).TotalGroundedBmb),...
    3133        (md.results.TransientSolution(2).Vx),...
    3234        (md.results.TransientSolution(2).Vy),...
    … …  
    4143        (md.results.TransientSolution(2).GroundedArea),...
    4244        (md.results.TransientSolution(2).FloatingArea),...
     45        (md.results.TransientSolution(2).TotalFloatingBmb),...
     46        (md.results.TransientSolution(2).TotalGroundedBmb),...
    4347        (md.results.TransientSolution(3).Vx),...
    4448        (md.results.TransientSolution(3).Vy),...
    … …  
    5357        (md.results.TransientSolution(3).GroundedArea),...
    5458        (md.results.TransientSolution(3).FloatingArea),...
     59        (md.results.TransientSolution(3).TotalFloatingBmb),...
     60        (md.results.TransientSolution(3).TotalGroundedBmb),...
    5561        };

  • issm/trunk-jpl/test/NightlyRun/test317.py

    r19789 r20209  
    1515md=setflowequation(md,'HO','all')
    1616md.cluster=generic('name',oshostname(),'np',3)
    17 md.transient.requested_outputs=['default','GroundedArea','FloatingArea']
     17md.transient.requested_outputs=['default','GroundedArea','FloatingArea','TotalFloatingBmb','TotalGroundedBmb']
    1818md=solve(md,TransientSolutionEnum())
    1919
    2020#Fields and tolerances to track changes
    21 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1','FloatingArea1'\
    22         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2','FloatingArea2',\
    23         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3','FloatingArea']
    24 field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,\
    25                 1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,\
    26                 1e-09,5e-10,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12]
     21field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1'\
     22        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2','FloatingArea2','TotalFloatingBmb2','TotalGroundedBmb2',\
     23        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3','FloatingArea3','TotalFloatingBmb2','TotalGroundedBmb2']
     24field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12,\
     25                1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12,\
     26                1e-09,5e-10,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12]
    2727field_values=[\
    2828        md.results.TransientSolution[0].Vx,\
    … …  
    3838        md.results.TransientSolution[0].GroundedArea,\
    3939        md.results.TransientSolution[0].FloatingArea,\
     40        md.results.TransientSolution[0].TotalFloatingBmb,\
     41        md.results.TransientSolution[0].TotalGroundedBmb,\
    4042        md.results.TransientSolution[1].Vx,\
    4143        md.results.TransientSolution[1].Vy,\
    … …  
    5052        md.results.TransientSolution[1].GroundedArea,\
    5153        md.results.TransientSolution[1].FloatingArea,\
     54        md.results.TransientSolution[1].TotalFloatingBmb,\
     55        md.results.TransientSolution[1].TotalGroundedBmb,\
    5256        md.results.TransientSolution[2].Vx,\
    5357        md.results.TransientSolution[2].Vy,\
    … …  
    6266        md.results.TransientSolution[2].GroundedArea,\
    6367        md.results.TransientSolution[2].FloatingArea,\
     68        md.results.TransientSolution[3].TotalFloatingBmb,\
     69        md.results.TransientSolution[3].TotalGroundedBmb,\
    6470        ]

  • issm/trunk-jpl/test/NightlyRun/test408.m

    r19519 r20209  
    55md=setflowequation(md,'SSA','all');
    66md.cluster=generic('name',oshostname(),'np',3);
    7 md.transient.requested_outputs={'default','GroundedArea'};
     7md.transient.requested_outputs={'default','GroundedArea','TotalFloatingBmb','TotalGroundedBmb'};
    88md=solve(md,TransientSolutionEnum());
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1',...
    12         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2',...
    13         'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3'};
    14 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
     11field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1','TotalFloatingBmb1','TotalGroundedBmb1',...
     12        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2','TotalFloatingBmb2','TotalGroundedBmb2',...
     13        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3','TotalFloatingBmb3','TotalGroundedBmb3'};
     14field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     15        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
     16        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1517field_values={...
    1618        (md.results.TransientSolution(1).Vx),...
    … …  
    2224        (md.results.TransientSolution(1).Thickness),...
    2325        (md.results.TransientSolution(1).GroundedArea),...
     26        (md.results.TransientSolution(1).TotalFloatingBmb),...
     27        (md.results.TransientSolution(1).TotalGroundedBmb),...
    2428        (md.results.TransientSolution(2).Vx),...
    2529        (md.results.TransientSolution(2).Vy),...
    … …  
    3034        (md.results.TransientSolution(2).Thickness),...
    3135        (md.results.TransientSolution(2).GroundedArea),...
     36        (md.results.TransientSolution(2).TotalFloatingBmb),...
     37        (md.results.TransientSolution(2).TotalGroundedBmb),...
    3238        (md.results.TransientSolution(3).Vx),...
    3339        (md.results.TransientSolution(3).Vy),...
    … …  
    3844        (md.results.TransientSolution(3).Thickness),...
    3945        (md.results.TransientSolution(3).GroundedArea),...
     46        (md.results.TransientSolution(3).TotalFloatingBmb),...
     47        (md.results.TransientSolution(3).TotalGroundedBmb),...
    4048        };

  • issm/trunk-jpl/test/NightlyRun/test408.py

    r19522 r20209  
    1515md=setflowequation(md,'SSA','all')
    1616md.cluster=generic('name',oshostname(),'np',3)
    17 md.transient.requested_outputs=['default','GroundedArea']
     17md.transient.requested_outputs=['default','GroundedArea','TotalFloatingBmb','TotalGroundedBmb']
    1818md=solve(md,TransientSolutionEnum())
    1919
    2020#Fields and tolerances to track changes
    21 field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3']
    22 field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
     21field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1','TotalFloatingBmb1','TotalGroundedBmb1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2','TotalFloatingBmb2','TotalGroundedBmb2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3','TotalFloatingBmb3','TotalGroundedBmb3']
     22field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
    2323field_values=[\
    2424        md.results.TransientSolution[0].Vx,\
    … …  
    3030        md.results.TransientSolution[0].Thickness,\
    3131        md.results.TransientSolution[0].GroundedArea,\
     32        md.results.TransientSolution[0].TotalFloatingBmb,\
     33        md.results.TransientSolution[0].TotalGroundedBmb,\
    3234        md.results.TransientSolution[1].Vx,\
    3335        md.results.TransientSolution[1].Vy,\
    … …  
    3840        md.results.TransientSolution[1].Thickness,\
    3941        md.results.TransientSolution[1].GroundedArea,\
     42        md.results.TransientSolution[2].TotalFloatingBmb,\
     43        md.results.TransientSolution[2].TotalGroundedBmb,\
    4044        md.results.TransientSolution[2].Vx,\
    4145        md.results.TransientSolution[2].Vy,\
    … …  
    4549        md.results.TransientSolution[2].Surface,\
    4650        md.results.TransientSolution[2].Thickness,\
    47         md.results.TransientSolution[1].GroundedArea,\
     51        md.results.TransientSolution[2].GroundedArea,\
     52        md.results.TransientSolution[2].TotalFloatingBmb,\
     53        md.results.TransientSolution[2].TotalGroundedBmb,\
    4854        ]
Note: See TracChangeset for help on using the changeset viewer.