Changeset 18812

Timestamp:

11/19/14 14:37:13 (10 years ago)

Author:

Eric.Larour

Message:

CHG: added output definition for masconaxpby object, which combines masscons together.
Added corresponding enums and corresponding Massconaxpby.h object in the classes.

Location:

issm/trunk-jpl/src

Files:

• c/classes/IoModel.h (modified) (1 diff)
• c/classes/Massconaxpby.h (added)
• c/classes/classes.h (modified) (1 diff)
• c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (6 diffs)
• m/classes/massconaxpby.m (added)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/MassconaxpbyAlphaEnum.m (added)
• m/enum/MassconaxpbyBetaEnum.m (added)
• m/enum/MassconaxpbyEnum.m (added)
• m/enum/MassconaxpbyNameEnum.m (added)
• m/enum/MassconaxpbyNamexEnum.m (added)
• m/enum/MassconaxpbyNameyEnum.m (added)

issm/trunk-jpl/src/c/classes/IoModel.h

@@ -86 +86 @@
                 void        FetchMultipleData(int*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,int data_enum);
                 void        FetchMultipleData(int** pvector, int* pnum_instances,int data_enum);
+                void        FetchMultipleData(IssmDouble** pvector, int* pnum_instances,int data_enum);
                 void        FetchData(Option **poption,int data_enum);
                 void        FetchData(int num,...);

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

@@ -20 +20 @@
 #include "./Misfit.h"
 #include "./Masscon.h"
+#include "./Massconaxpby.h"
 
 /*Constraints: */

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

@@ -148 +148 @@
                                 /*}}}*/
                         }
+                        else if (output_definition_enums[i]==MassconaxpbyEnum){
+                                /*Deal with masscon combinations: {{{*/
+                                
+                                /*masscon variables: */
+                                char**       masscon_name_s             = NULL;    
+                                char**       masscon_namex_s             = NULL;    
+                                char**       masscon_namey_s             = NULL;    
+                                IssmDouble*  masscon_alpha_s     = NULL;
+                                IssmDouble*  masscon_beta_s     = NULL;
+                                int          num;
+
+                                /*Fetch names and multiplicators, etc ... (see src/m/classes/masscon_axpby.m): */
+                                iomodel->FetchMultipleData(&masscon_name_s,&num,MassconaxpbyNameEnum);
+                                iomodel->FetchMultipleData(&masscon_namex_s,&num,MassconaxpbyNamexEnum);
+                                iomodel->FetchMultipleData(&masscon_namey_s,&num,MassconaxpbyNameyEnum);
+                                iomodel->FetchMultipleData(&masscon_alpha_s,&num,MassconaxpbyAlphaEnum);
+                                iomodel->FetchMultipleData(&masscon_beta_s,&num,MassconaxpbyBetaEnum);
+                                for(j=0;j<num;j++){
+
+                                        /*Create a masscon axpyb object: */
+                                        output_definitions->AddObject(new Massconaxpby(masscon_name_s[j],masscon_namex_s[j],masscon_namey_s[j],masscon_alpha_s[j],masscon_beta_s[j]));
+
+                                }
+
+                                /*Free ressources:*/
+                                for(j=0;j<num;j++){
+                                        char* string=NULL;
+                                        string = masscon_name_s[j];    xDelete<char>(string);
+                                        string = masscon_namex_s[j];    xDelete<char>(string);
+                                        string = masscon_namey_s[j];    xDelete<char>(string);
+                                }
+                                xDelete<char*>(masscon_name_s);
+                                xDelete<char*>(masscon_namex_s);
+                                xDelete<char*>(masscon_namey_s);
+                                xDelete<IssmDouble>(masscon_alpha_s);
+                                xDelete<IssmDouble>(masscon_beta_s);
+                                /*}}}*/
+                        }
                         else _error_("output definition enum " << output_definition_enums[i] << "not supported yet!");
                 }

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

@@ -494 +494 @@
         MassconNameEnum,
         MassconLevelsetEnum,
+        MassconaxpbyEnum,
+        MassconaxpbyNameEnum,
+        MassconaxpbyNamexEnum,
+        MassconaxpbyNameyEnum,
+        MassconaxpbyAlphaEnum,
+        MassconaxpbyBetaEnum,
         NodeSIdEnum,
         VectorParamEnum,

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

@@ -491 +491 @@
                 case MassconNameEnum : return "MassconName";
                 case MassconLevelsetEnum : return "MassconLevelset";
+                case MassconaxpbyEnum : return "Massconaxpby";
+                case MassconaxpbyNameEnum : return "MassconaxpbyName";
+                case MassconaxpbyNamexEnum : return "MassconaxpbyNamex";
+                case MassconaxpbyNameyEnum : return "MassconaxpbyNamey";
+                case MassconaxpbyAlphaEnum : return "MassconaxpbyAlpha";
+                case MassconaxpbyBetaEnum : return "MassconaxpbyBeta";
                 case NodeSIdEnum : return "NodeSId";
                 case VectorParamEnum : return "VectorParam";

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

@@ -500 +500 @@
               else if (strcmp(name,"MassconName")==0) return MassconNameEnum;
               else if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum;
-              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
+              else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
+              else if (strcmp(name,"MassconaxpbyName")==0) return MassconaxpbyNameEnum;
+              else if (strcmp(name,"MassconaxpbyNamex")==0) return MassconaxpbyNamexEnum;
+              else if (strcmp(name,"MassconaxpbyNamey")==0) return MassconaxpbyNameyEnum;
+              else if (strcmp(name,"MassconaxpbyAlpha")==0) return MassconaxpbyAlphaEnum;
+              else if (strcmp(name,"MassconaxpbyBeta")==0) return MassconaxpbyBetaEnum;
+         else stage=5;
+   }
+   if(stage==5){
+              if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
               else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
               else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
@@ -506 +515 @@
               else if (strcmp(name,"Segment")==0) return SegmentEnum;
               else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
-         else stage=5;
-   }
-   if(stage==5){
-              if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
+              else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
               else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
               else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
@@ -623 +629 @@
               else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
               else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum;
-              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
               else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
               else if (strcmp(name,"GiaW")==0) return GiaWEnum;
@@ -629 +638 @@
               else if (strcmp(name,"P1")==0) return P1Enum;
               else if (strcmp(name,"P1DG")==0) return P1DGEnum;
-         else stage=6;
-   }
-   if(stage==6){
-              if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
+              else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
               else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
               else if (strcmp(name,"P2")==0) return P2Enum;
@@ -746 +752 @@
               else if (strcmp(name,"Seq")==0) return SeqEnum;
               else if (strcmp(name,"Mpi")==0) return MpiEnum;
-              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
+         else stage=7;
+   }
+   if(stage==7){
+              if (strcmp(name,"Mumps")==0) return MumpsEnum;
               else if (strcmp(name,"Gsl")==0) return GslEnum;
               else if (strcmp(name,"Option")==0) return OptionEnum;
@@ -752 +761 @@
               else if (strcmp(name,"OptionCell")==0) return OptionCellEnum;
               else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
-         else stage=7;
-   }
-   if(stage==7){
-              if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
+              else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;
               else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;

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

@@ -483 +483 @@
 def MassconNameEnum(): return StringToEnum("MassconName")[0]
 def MassconLevelsetEnum(): return StringToEnum("MassconLevelset")[0]
+def MassconaxpbyEnum(): return StringToEnum("Massconaxpby")[0]
+def MassconaxpbyNameEnum(): return StringToEnum("MassconaxpbyName")[0]
+def MassconaxpbyNamexEnum(): return StringToEnum("MassconaxpbyNamex")[0]
+def MassconaxpbyNameyEnum(): return StringToEnum("MassconaxpbyNamey")[0]
+def MassconaxpbyAlphaEnum(): return StringToEnum("MassconaxpbyAlpha")[0]
+def MassconaxpbyBetaEnum(): return StringToEnum("MassconaxpbyBeta")[0]
 def NodeSIdEnum(): return StringToEnum("NodeSId")[0]
 def VectorParamEnum(): return StringToEnum("VectorParam")[0]