Changeset 6748

Timestamp:

12/17/10 10:04:20 (14 years ago)

Author:

Eric.Larour

Message:

New enums including state of rift segments.
A rift segment now has a state, ie: Free, Closed or Open.

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/EnumDefinitions/EnumToString.cpp (modified) (1 diff)
• c/EnumDefinitions/StringToEnum.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/ModelProcessorx.h (modified) (1 diff)
• c/objects/Loads/Riftfront.cpp (modified) (7 diffs)
• c/objects/Loads/Riftfront.h (modified) (1 diff)
• c/shared/TriMesh/TriMeshUtils.cpp (modified) (2 diffs)
• m/model/presolve.m (modified) (2 diffs)
• mex/TriMeshProcessRifts/TriMeshProcessRifts.cpp (modified) (4 diffs)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -158 +158 @@
         AirEnum,
         MelangeEnum,
+        /*}}}*/
+        /*Rift state {{{1*/
+        FreeEnum,
+        OpenEnum,
+        ClosedEnum,
         /*}}}*/
         /*Inputs {{{1*/

issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

@@ -134 +134 @@
                 case AirEnum : return "Air";
                 case MelangeEnum : return "Melange";
+                case FreeEnum : return "Free";
+                case OpenEnum : return "Open";
+                case ClosedEnum : return "Closed";
                 case AccumulationRateEnum : return "AccumulationRate";
                 case AdjointxEnum : return "Adjointx";

issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

@@ -132 +132 @@
         else if (strcmp(name,"Air")==0) return AirEnum;
         else if (strcmp(name,"Melange")==0) return MelangeEnum;
+        else if (strcmp(name,"Free")==0) return FreeEnum;
+        else if (strcmp(name,"Open")==0) return OpenEnum;
+        else if (strcmp(name,"Closed")==0) return ClosedEnum;
         else if (strcmp(name,"AccumulationRate")==0) return AccumulationRateEnum;
         else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -6 +6 @@
 #define _MODEL_PROCESSORX_H_
 
-#define RIFTINFOSIZE 11
+#define RIFTINFOSIZE 12
 
 class DataSet;

issm/trunk/src/c/objects/Loads/Riftfront.cpp

@@ -87 +87 @@
         this->length=*(iomodel->riftinfo+RIFTINFOSIZE*i+6);
         this->fraction=*(iomodel->riftinfo+RIFTINFOSIZE*i+9);
+        this->state=*(iomodel->riftinfo+RIFTINFOSIZE*i+11);
 
         //intialize inputs, and add as many inputs per element as requested: 
@@ -156 +157 @@
         printf("   fraction: %i\n",fraction);
         printf("   fractionincrement: %i\n",fractionincrement);
+        printf("   state: %i\n",state);
         printf("   frozen: %s\n",frozen ? "true":"false");
                 
@@ -209 +211 @@
         memcpy(marshalled_dataset,&fraction,sizeof(fraction));marshalled_dataset+=sizeof(fraction);
         memcpy(marshalled_dataset,&frozen,sizeof(frozen));marshalled_dataset+=sizeof(frozen);
+        memcpy(marshalled_dataset,&state,sizeof(state));marshalled_dataset+=sizeof(state);
         memcpy(marshalled_dataset,&counter,sizeof(counter));marshalled_dataset+=sizeof(counter);
         memcpy(marshalled_dataset,&prestable,sizeof(prestable));marshalled_dataset+=sizeof(prestable);
@@ -243 +246 @@
                 +sizeof(fraction)
                 +sizeof(frozen)
+                +sizeof(state)
                 +sizeof(counter)
                 +sizeof(prestable)
@@ -273 +277 @@
         memcpy(&fraction,marshalled_dataset,sizeof(fraction));marshalled_dataset+=sizeof(fraction);
         memcpy(&frozen,marshalled_dataset,sizeof(frozen));marshalled_dataset+=sizeof(frozen);
+        memcpy(&state,marshalled_dataset,sizeof(state));marshalled_dataset+=sizeof(state);
         memcpy(&counter,marshalled_dataset,sizeof(counter));marshalled_dataset+=sizeof(counter);
         memcpy(&prestable,marshalled_dataset,sizeof(prestable));marshalled_dataset+=sizeof(prestable);
@@ -338 +343 @@
         riftfront->active=this->active;
         riftfront->frozen=this->frozen;
+        riftfront->state=this->state;
         riftfront->counter=this->counter;
         riftfront->prestable=this->prestable;
@@ -702 +708 @@
         }
 
+        /*Is this rift segment state specified by user input? :*/
+        if (this->state==OpenEnum || this->state==ClosedEnum){
+
+                if(this->state==OpenEnum)this->active=0;
+                if(this->state==ClosedEnum)this->active=1;
+                
+                /*this segment is like frozen, no instability here: */
+                *punstable=0;
+                return 1;
+        }
+
+
         /*recover parameters: */
         this->inputs->GetParameterValue(&fractionincrement,FractionIncrementEnum);

issm/trunk/src/c/objects/Loads/Riftfront.h

@@ -41 +41 @@
                 double   length;
                 double   fraction;
+                int      state;
                 
                 Parameters* parameters; //pointer to solution parameters

issm/trunk/src/c/shared/TriMesh/TriMeshUtils.cpp

@@ -10 +10 @@
 #include "../../include/include.h"
 
+#define RIFTPENALTYPAIRSWIDTH 8
 int IsGridOnRift(int* riftsegments, int nriftsegs, int grid){
 
@@ -986 +987 @@
 
                 /*allocate riftpenaltypairs, and riftnumpenaltypairs: */
-                if((numsegs/2-1)!=0)riftpenaltypairs=(double*)xcalloc((numsegs/2-1)*7,sizeof(double));
+                if((numsegs/2-1)!=0)riftpenaltypairs=(double*)xcalloc((numsegs/2-1)*RIFTPENALTYPAIRSWIDTH,sizeof(double));
                 
                 /*Go through only one flank of the rifts, not counting the tips: */

issm/trunk/src/m/model/presolve.m

@@ -31 +31 @@
 end
 
-md.riftinfo=zeros(numpairs,10); % 2 for grids + 2 for elements+ 2 for  normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction.
+md.riftinfo=zeros(numpairs,12); % 2 for grids + 2 for elements+ 2 for  normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction + 1 for fractionincrement + 1 for state.
 
 count=1;
@@ -41 +41 @@
         md.riftinfo(count:count+numpairsforthisrift-1,10)=md.rifts(i).fraction;
         md.riftinfo(count:count+numpairsforthisrift-1,11)=md.rifts(i).fractionincrement;
+        md.riftinfo(count:count+numpairsforthisrift-1,12)=md.rifts(i).state;
         count=count+numpairsforthisrift;
 end

issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.cpp

@@ -27 +27 @@
         /*empty rifts structure: */
         double* pNaN=NULL;
-        const   char*   fnames[9];
+        const   char*   fnames[10];
         mwSize     ndim=2;
         mwSize          dimensions[2] = {1,1};
@@ -47 +47 @@
         double* segmentmarkers_in=NULL;
 
+        /* state: */
+        double* state=NULL;
+
         int     num_seg;
 
@@ -238 +241 @@
                 fnames[7] = "fraction";
                 fnames[8] = "fractionincrement";
+                fnames[9] = "state";
 
                 dimensions[0]=out_numrifts;
 
-                pmxa_array=mxCreateStructArray( ndim,dimensions,9,fnames);
+                pmxa_array=mxCreateStructArray( ndim,dimensions,10,fnames);
                 
                 for (i=0;i<out_numrifts;i++){
@@ -287 +291 @@
                         mxSetField(pmxa_array,i,"fraction",mxCreateDoubleScalar(0)); //default is ice
                         mxSetField(pmxa_array,i,"fractionincrement",mxCreateDoubleScalar(0.1)); 
+
+                        /*State: */
+                        state=(double*)xmalloc(out_riftsnumpenaltypairs[i]*sizeof(double));
+                        for(j=0;j<out_riftsnumpenaltypairs[i];j++)state[j]=FreeEnum;
+                        pmxa_array2= mxCreateDoubleMatrix(0,0,mxREAL);
+                        mxSetM(pmxa_array2,1);
+                        mxSetN(pmxa_array2,out_riftsnumpenaltypairs[i]);
+                        mxSetPr(pmxa_array2,state);
+                        mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, "transpose");
+                        
+                        mxSetField(pmxa_array,i,"state",pmxa_array3);
                 }
         }