Changeset 5552
- Timestamp:
- 08/24/10 14:52:12 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r5526 r5552 113 113 PengridEnum, 114 114 PenpairEnum, 115 QuadIceFrontEnum,116 115 QuadRiftFrontEnum, 117 116 RiftfrontEnum, 118 SegmentIcefrontEnum,119 117 SegmentRiftfrontEnum, 118 MacAyealIceFrontEnum, 119 PattynIceFrontEnum, 120 StokesIceFrontEnum, 120 121 /*Materials: */ 121 122 MaterialEnum, -
issm/trunk/src/c/EnumDefinitions/EnumToString.cpp
r5526 r5552 98 98 case PengridEnum : return "Pengrid"; 99 99 case PenpairEnum : return "Penpair"; 100 case QuadIceFrontEnum : return "QuadIceFront";101 100 case QuadRiftFrontEnum : return "QuadRiftFront"; 102 101 case RiftfrontEnum : return "Riftfront"; 103 case SegmentIcefrontEnum : return "SegmentIcefront";104 102 case SegmentRiftfrontEnum : return "SegmentRiftfront"; 103 case MacAyealIceFrontEnum : return "MacAyealIceFront"; 104 case PattynIceFrontEnum : return "PattynIceFront"; 105 case StokesIceFrontEnum : return "StokesIceFront"; 105 106 case MaterialEnum : return "Material"; 106 107 case MaticeEnum : return "Matice"; -
issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp
r5526 r5552 96 96 else if (strcmp(name,"Pengrid")==0) return PengridEnum; 97 97 else if (strcmp(name,"Penpair")==0) return PenpairEnum; 98 else if (strcmp(name,"QuadIceFront")==0) return QuadIceFrontEnum;99 98 else if (strcmp(name,"QuadRiftFront")==0) return QuadRiftFrontEnum; 100 99 else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; 101 else if (strcmp(name,"SegmentIcefront")==0) return SegmentIcefrontEnum;102 100 else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; 101 else if (strcmp(name,"MacAyealIceFront")==0) return MacAyealIceFrontEnum; 102 else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; 103 else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum; 103 104 else if (strcmp(name,"Material")==0) return MaterialEnum; 104 105 else if (strcmp(name,"Matice")==0) return MaticeEnum; -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp
r5433 r5552 56 56 57 57 /*Do not create ice front if Hutter or Stokes elements*/ 58 if ((int)*(iomodel->elements_type+element)== (HutterApproximationEnum || StokesApproximationEnum)) continue;58 if ((int)*(iomodel->elements_type+element)==HutterApproximationEnum) continue; 59 59 60 60 /*Create and add load: */ 61 61 if ((int)*(iomodel->elements_type+element)==(MacAyealApproximationEnum)){ 62 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel, SegmentIcefrontEnum,DiagnosticHorizAnalysisEnum));62 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyealIceFrontEnum,DiagnosticHorizAnalysisEnum)); 63 63 count++; 64 64 } 65 65 else if ((int)*(iomodel->elements_type+element)==(PattynApproximationEnum)){ 66 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,QuadIceFrontEnum,DiagnosticHorizAnalysisEnum)); 66 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,PattynIceFrontEnum,DiagnosticHorizAnalysisEnum)); 67 count++; 68 } 69 else if ((int)*(iomodel->elements_type+element)==(StokesApproximationEnum)){ 70 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,StokesIceFrontEnum,DiagnosticHorizAnalysisEnum)); 67 71 count++; 68 72 } 69 73 else if ((int)*(iomodel->elements_type+element)==(MacAyealPattynApproximationEnum)){ 70 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel, SegmentIcefrontEnum,DiagnosticHorizAnalysisEnum));74 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyealIceFrontEnum,DiagnosticHorizAnalysisEnum)); 71 75 count++; 72 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel, QuadIceFrontEnum,DiagnosticHorizAnalysisEnum));76 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,PattynIceFrontEnum,DiagnosticHorizAnalysisEnum)); 73 77 count++; 74 78 } -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp
r5510 r5552 62 62 63 63 /*Create and add load: */ 64 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel, QuadIceFrontEnum,DiagnosticStokesAnalysisEnum));64 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,StokesIceFrontEnum,DiagnosticStokesAnalysisEnum)); 65 65 count++; 66 66 -
issm/trunk/src/c/objects/Loads/Icefront.cpp
r5547 r5552 55 55 icefront_mparid=iomodel->numberofelements+1; //matlab indexing 56 56 57 if (in_icefront_type== SegmentIcefrontEnum){57 if (in_icefront_type==MacAyealIceFrontEnum){ 58 58 icefront_node_ids[0]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+0); 59 59 icefront_node_ids[1]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+1); 60 60 } 61 else if (in_icefront_type== QuadIceFrontEnum){61 else if (in_icefront_type==PattynIceFrontEnum || in_icefront_type==StokesIceFrontEnum){ 62 62 icefront_node_ids[0]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+0); 63 63 icefront_node_ids[1]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+1); … … 67 67 else ISSMERROR("in_icefront_type %s not supported yet!",EnumToString(in_icefront_type)); 68 68 69 if (in_icefront_type== QuadIceFrontEnum) num_nodes=4;69 if (in_icefront_type==PattynIceFrontEnum || in_icefront_type==StokesIceFrontEnum) num_nodes=4; 70 70 else num_nodes=2; 71 71 icefront_fill=(int)*(iomodel->pressureload+segment_width*i+segment_width-1); … … 294 294 /*Just branch to the correct element icefront vector generator, according to the type of analysis we are carrying out: */ 295 295 if (analysis_type==DiagnosticHorizAnalysisEnum){ 296 CreatePVectorDiagnosticHoriz( pg); 296 int type; 297 inputs->GetParameterValue(&type,TypeEnum); 298 if (type==MacAyealIceFrontEnum){ 299 CreatePVectorDiagnosticMacAyeal( pg); 300 } 301 else if (type==PattynIceFrontEnum){ 302 CreatePVectorDiagnosticPattyn( pg); 303 } 304 else if (type==StokesIceFrontEnum){ 305 CreatePVectorDiagnosticStokes( pg); 306 } 307 else ISSMERROR("Icefront type %s not supported yet",EnumToString(type)); 297 308 } 298 309 else if (analysis_type==DiagnosticStokesAnalysisEnum){ … … 377 388 378 389 /*Icefront numerics: */ 379 /*FUNCTION Icefront::CreatePVectorDiagnosticHoriz {{{1*/380 void Icefront::CreatePVectorDiagnosticHoriz( Vec pg){381 382 int type;383 inputs->GetParameterValue(&type,TypeEnum);384 385 /*Branck on the type of icefront: */386 if (type==SegmentIcefrontEnum){387 CreatePVectorDiagnosticMacAyeal(pg);388 }389 else if (type==QuadIceFrontEnum){390 CreatePVectorDiagnosticPattyn(pg);391 }392 else ISSMERROR("type %i not supported",type);393 }394 /*}}}*/395 390 /*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal{{{1*/ 396 391 void Icefront::CreatePVectorDiagnosticMacAyeal( Vec pg){ … … 822 817 823 818 /*How many nodes? :*/ 824 if(type== SegmentIcefrontEnum)numberofnodes=2;819 if(type==MacAyealIceFrontEnum)numberofnodes=2; 825 820 else numberofnodes=4; 826 821 -
issm/trunk/src/c/objects/Loads/Icefront.h
r5547 r5552 71 71 /*}}}*/ 72 72 /*Load management: {{{1*/ 73 void CreatePVectorDiagnosticHoriz( Vec pg);74 73 void CreatePVectorDiagnosticMacAyeal( Vec pg); 75 74 void CreatePVectorDiagnosticPattyn( Vec pg);
Note:
See TracChangeset
for help on using the changeset viewer.