Changeset 15433
- Timestamp:
- 07/04/13 17:14:42 (12 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 1 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/Elements/Element.h
r15387 r15433 75 75 virtual void GetVectorFromResults(Vector<IssmDouble>* vector,int id,int enum_in,int interp)=0; 76 76 virtual void InputArtificialNoise(int enum_type,IssmDouble min,IssmDouble max)=0; 77 virtual int* GetHorizontalNeighboorSids(void)=0;78 77 virtual IssmDouble TimeAdapt()=0; 79 78 virtual void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm)=0; -
issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
r15428 r15433 31 31 this->parameters = NULL; 32 32 this->results = NULL; 33 for(int i=0;i<3;i++)this->horizontalneighborsids[i]=UNDEF;34 33 } 35 34 /*}}}*/ … … 66 65 else penta_elements_ids[0]=reCast<int,IssmDouble>((iomodel->Data(MeshLowerelementsEnum)[index])); 67 66 this->InitHookNeighbors(penta_elements_ids); 68 69 /*Build horizontalneighborsids list: */70 _assert_(iomodel->Data(MeshElementconnectivityEnum));71 for(i=0;i<3;i++) this->horizontalneighborsids[i]=reCast<int,IssmDouble>(iomodel->Data(MeshElementconnectivityEnum)[3*index+i])-1;72 67 73 68 //this->parameters: we still can't point to it, it may not even exist. Configure will handle this. … … 133 128 penta->matpar=(Matpar*)penta->hmatpar->delivers(); 134 129 penta->verticalneighbors=(Penta**)penta->hneighbors->deliverp(); 135 136 /*neighbors: */137 for(i=0;i<3;i++)penta->horizontalneighborsids[i]=this->horizontalneighborsids[i];138 130 139 131 return penta; … … 696 688 _printf_(" results\n"); 697 689 results->DeepEcho(); 698 _printf_("neighboor sids: \n");699 _printf_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2] << "\n");700 690 } 701 691 /*}}}*/ … … 992 982 *hy=ymax-ymin; 993 983 *hz=zmax-zmin; 994 }995 /*}}}*/996 /*FUNCTION Penta::GetHorizontalNeighboorSids {{{*/997 int* Penta::GetHorizontalNeighboorSids(){998 999 /*return PentaRef field*/1000 return &this->horizontalneighborsids[0];1001 1002 984 } 1003 985 /*}}}*/ -
issm/trunk-jpl/src/c/classes/Elements/Penta.h
r15425 r15433 40 40 Matpar *matpar; // 1 material parameter 41 41 Penta **verticalneighbors; // 2 neighbors: first one under, second one above 42 int horizontalneighborsids[3];43 42 44 43 Parameters *parameters; //pointer to solution parameters … … 116 115 int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum); 117 116 IssmDouble TimeAdapt(); 118 int* GetHorizontalNeighboorSids(void);119 117 void ViscousHeatingCreateInput(void); 120 118 -
issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
r15429 r15433 31 31 this->material = NULL; 32 32 this->matpar = NULL; 33 for(i=0;i<3;i++)this->horizontalneighborsids[i]=UNDEF;34 33 this->inputs = NULL; 35 34 this->parameters = NULL; … … 49 48 //this->parameters: we still can't point to it, it may not even exist. Configure will handle this. 50 49 this->parameters=NULL; 51 52 /*Build horizontalneighborsids list: */53 _assert_(iomodel->Data(MeshElementconnectivityEnum));54 //for (i=0;i<3;i++) this->horizontalneighborsids[i]=(int)iomodel->elementconnectivity[3*index+i]-1;55 50 56 51 /*intialize inputs and results: */ … … 117 112 tria->material=(Material*)tria->hmaterial->delivers(); 118 113 tria->matpar=(Matpar*)tria->hmatpar->delivers(); 119 120 /*neighbors: */121 for(i=0;i<3;i++)tria->horizontalneighborsids[i]=this->horizontalneighborsids[i];122 114 123 115 return tria; … … 561 553 else _printf_("results=NULL\n"); 562 554 563 _printf_("neighboor sids: \n");564 _printf_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2] << "\n");565 566 555 return; 567 556 } … … 672 661 if (results) results->Echo(); 673 662 else _printf_("results=NULL\n"); 674 675 _printf_("neighboor sids: \n");676 _printf_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2] << "\n");677 663 } 678 664 /*}}}*/ … … 729 715 /*return TriaRef field*/ 730 716 return this->element_type; 731 732 }733 /*}}}*/734 /*FUNCTION Tria::GetHorizontalNeighboorSids {{{*/735 int* Tria::GetHorizontalNeighboorSids(){736 737 /*return TriaRef field*/738 return &this->horizontalneighborsids[0];739 717 740 718 } -
issm/trunk-jpl/src/c/classes/Elements/Tria.h
r15401 r15433 37 37 Material *material; // 1 material ice 38 38 Matpar *matpar; // 1 material parameter 39 int horizontalneighborsids[3];40 39 41 40 Parameters *parameters; //pointer to solution parameters … … 115 114 void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type); 116 115 IssmDouble TimeAdapt(); 117 int* GetHorizontalNeighboorSids(void);118 116 119 117 #ifdef _HAVE_RESPONSES_ -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp
r15428 r15433 34 34 materials = new Materials(); 35 35 36 iomodel->FetchData(1,MeshElementconnectivityEnum);37 36 #ifdef _HAVE_3D_ 38 37 if(iomodel->dim==3)iomodel->FetchData(2,MeshUpperelementsEnum,MeshLowerelementsEnum); … … 73 72 74 73 /*Free data: */ 75 iomodel->DeleteData( 9,MeshElementconnectivityEnum,MeshUpperelementsEnum,MeshLowerelementsEnum,74 iomodel->DeleteData(8,MeshUpperelementsEnum,MeshLowerelementsEnum, 76 75 MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsRheologyZEnum,InversionControlParametersEnum,InversionMinParametersEnum, 77 76 InversionMaxParametersEnum); -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r15432 r15433 169 169 MeshAverageVertexConnectivityEnum, 170 170 MeshDimensionEnum, 171 MeshElementconnectivityEnum,172 171 MeshElementonbedEnum, 173 172 MeshElementonsurfaceEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r15432 r15433 177 177 case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity"; 178 178 case MeshDimensionEnum : return "MeshDimension"; 179 case MeshElementconnectivityEnum : return "MeshElementconnectivity";180 179 case MeshElementonbedEnum : return "MeshElementonbed"; 181 180 case MeshElementonsurfaceEnum : return "MeshElementonsurface"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r15432 r15433 180 180 else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; 181 181 else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum; 182 else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum;183 182 else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum; 184 183 else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; … … 260 259 else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum; 261 260 else if (strcmp(name,"Thickness")==0) return ThicknessEnum; 261 else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; 262 262 else stage=3; 263 263 } 264 264 if(stage==3){ 265 if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; 266 else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; 265 if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; 267 266 else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; 268 267 else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; … … 383 382 else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum; 384 383 else if (strcmp(name,"Segment")==0) return SegmentEnum; 384 else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; 385 385 else stage=4; 386 386 } 387 387 if(stage==4){ 388 if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; 389 else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; 388 if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; 390 389 else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; 391 390 else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; … … 506 505 else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum; 507 506 else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; 507 else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; 508 508 else stage=5; 509 509 } 510 510 if(stage==5){ 511 if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; 512 else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; 511 if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; 513 512 else if (strcmp(name,"J")==0) return JEnum; 514 513 else if (strcmp(name,"Patch")==0) return PatchEnum; -
issm/trunk-jpl/src/m/classes/mesh.m
r15432 r15433 109 109 md = checkfield(md,'mesh.average_vertex_connectivity','>=',24,'message','''mesh.average_vertex_connectivity'' should be at least 24 in 3d'); 110 110 end 111 md = checkfield(md,'mesh.elementconnectivity','size',[md.mesh.numberofelements 3],'NaN',1);112 111 113 112 %Solution specific checks … … 196 195 WriteData(fid,'object',obj,'fieldname','lowerelements','format','DoubleMat','mattype',2); 197 196 WriteData(fid,'object',obj,'fieldname','upperelements','format','DoubleMat','mattype',2); 198 WriteData(fid,'object',obj,'fieldname','elementconnectivity','format','DoubleMat','mattype',3);199 197 WriteData(fid,'object',obj,'fieldname','average_vertex_connectivity','format','Integer'); 200 198 WriteData(fid,'object',obj,'fieldname','elements2d','format','DoubleMat','mattype',3); -
issm/trunk-jpl/src/m/classes/mesh.py
r15432 r15433 147 147 else: 148 148 md = checkfield(md,'mesh.average_vertex_connectivity','>=',24,'message',"'mesh.average_vertex_connectivity' should be at least 24 in 3d") 149 md = checkfield(md,'mesh.elementconnectivity','size',[md.mesh.numberofelements,3],'NaN',1)150 149 151 150 #Solution specific checks … … 179 178 WriteData(fid,'object',self,'fieldname','lowerelements','format','DoubleMat','mattype',2) 180 179 WriteData(fid,'object',self,'fieldname','upperelements','format','DoubleMat','mattype',2) 181 WriteData(fid,'object',self,'fieldname','elementconnectivity','format','DoubleMat','mattype',3)182 180 WriteData(fid,'object',self,'fieldname','average_vertex_connectivity','format','Integer') 183 181 WriteData(fid,'object',self,'fieldname','elements2d','format','DoubleMat','mattype',3) -
issm/trunk-jpl/src/m/enum/EnumDefinitions.py
r15432 r15433 2249 2249 return StringToEnum('MeshDimension')[0] 2250 2250 2251 def MeshElementconnectivityEnum():2252 """2253 MESHELEMENTCONNECTIVITYENUM - Enum of MeshElementconnectivity2254 2255 WARNING: DO NOT MODIFY THIS FILE2256 this file has been automatically generated by src/c/shared/Enum/Synchronize.sh2257 Please read src/c/shared/Enum/README for more information2258 2259 Usage:2260 macro=MeshElementconnectivityEnum()2261 """2262 2263 return StringToEnum('MeshElementconnectivity')[0]2264 2265 2251 def MeshElementonbedEnum(): 2266 2252 """ … … 7861 7847 """ 7862 7848 7863 return 5 607864 7849 return 559 7850 -
issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m
r15432 r15433 9 9 % macro=MaximumNumberOfEnums() 10 10 11 macro=5 60;11 macro=559;
Note:
See TracChangeset
for help on using the changeset viewer.