![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 9785
- Timestamp:
- 09/12/11 18:30:55 (14 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 4 edited
-
ad/Makefile.am (modified) (6 diffs)
-
c/Makefile.am (modified) (1 diff)
-
c/objects/Loads/Icefront.cpp (modified) (4 diffs)
-
c/objects/Loads/Icefront.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/ad/Makefile.am
r9773 r9785 38 38 ./objects/Material.h\ 39 39 ./objects/Load.h\ 40 ./objects/Contour.h\41 ./objects/Contour.cpp\42 ./objects/OptArgs.h\43 ./objects/OptPars.h\44 40 ./objects/Loads/Friction.h\ 45 41 ./objects/Loads/Friction.cpp\ … … 165 161 ./Container/Nodes.h\ 166 162 ./Container/Nodes.cpp\ 167 ./Container/Options.h\168 ./Container/Options.cpp\169 163 ./Container/Parameters.h\ 170 164 ./Container/Parameters.cpp\ … … 276 270 ./modules/InputScalex/InputScalex.h\ 277 271 ./modules/InputScalex/InputScalex.cpp\ 278 ./modules/SurfaceAreax/SurfaceAreax.h\279 ./modules/SurfaceAreax/SurfaceAreax.cpp\280 272 ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.h\ 281 273 ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp\ … … 325 317 ./modules/ConstraintsStatex/ConstraintsStatex.h\ 326 318 ./modules/ConstraintsStatex/ConstraintsStateLocal.h\ 327 ./modules/Responsex/Responsex.h\328 ./modules/Responsex/Responsex.cpp\329 319 ./modules/RequestedOutputsx/RequestedOutputsx.h\ 330 320 ./modules/RequestedOutputsx/RequestedOutputsx.cpp\ … … 472 462 ./shared/Numerics/BrentSearch.cpp\ 473 463 ./shared/Numerics/OptimalSearch.cpp\ 474 ./shared/Numerics/OptFunc.cpp 464 ./shared/Numerics/OptFunc.cpp\ 465 ./objects/OptArgs.h\ 466 ./objects/OptPars.h 467 475 468 endif 476 469 #}}} … … 539 532 ./modules/RheologyBbarx/RheologyBbarx.h\ 540 533 ./modules/MassFluxx/MassFluxx.cpp\ 541 ./modules/MassFluxx/MassFluxx.h 534 ./modules/MassFluxx/MassFluxx.h\ 535 ./modules/SurfaceAreax/SurfaceAreax.h\ 536 ./modules/SurfaceAreax/SurfaceAreax.cpp\ 537 ./modules/Responsex/Responsex.h\ 538 ./modules/Responsex/Responsex.cpp 542 539 endif 543 540 #}}} -
issm/trunk/src/c/Makefile.am
r9775 r9785 1050 1050 if DAKOTA 1051 1051 libpISSM_a_SOURCES += ./objects/DakotaPlugin.h\ 1052 ./objects/DakotaPlugin.cpp\1053 ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\1054 ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\1055 ./modules/DakotaResponsesx/DakotaResponsesx.h\1056 ./modules/DakotaResponsesx/DakotaResponsesx.cpp\1057 ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\1058 ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\1059 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\1060 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\1061 ./modules/Dakotax/Dakotax.h\1062 ./modules/Dakotax/Dakotax.cpp\1063 ./modules/Dakotax/DakotaMPI_Bcast.cpp\1064 ./modules/Dakotax/DakotaFree.cpp\1065 ./modules/Dakotax/SpawnCore.cpp\1066 ./modules/Dakotax/SpawnCoreParallel.cpp\1067 ./modules/Dakotax/DescriptorIndex.cpp\1068 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\1069 ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\1070 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h1052 ./objects/DakotaPlugin.cpp\ 1053 ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ 1054 ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\ 1055 ./modules/DakotaResponsesx/DakotaResponsesx.h\ 1056 ./modules/DakotaResponsesx/DakotaResponsesx.cpp\ 1057 ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\ 1058 ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\ 1059 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\ 1060 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\ 1061 ./modules/Dakotax/Dakotax.h\ 1062 ./modules/Dakotax/Dakotax.cpp\ 1063 ./modules/Dakotax/DakotaMPI_Bcast.cpp\ 1064 ./modules/Dakotax/DakotaFree.cpp\ 1065 ./modules/Dakotax/SpawnCore.cpp\ 1066 ./modules/Dakotax/SpawnCoreParallel.cpp\ 1067 ./modules/Dakotax/DescriptorIndex.cpp\ 1068 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\ 1069 ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\ 1070 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h 1071 1071 endif 1072 1072 #}}} -
issm/trunk/src/c/objects/Loads/Icefront.cpp
r9777 r9785 340 340 /*Just branch to the correct element icefront vector generator, according to the type of analysis we are carrying out: */ 341 341 switch(analysis_type){ 342 #ifdef _HAVE_DIAGNOSTIC_ 342 343 case DiagnosticHorizAnalysisEnum: 343 344 pe=CreatePVectorDiagnosticHoriz(); 344 345 break; 346 #endif 347 #ifdef _HAVE_CONTROL_ 345 348 case AdjointHorizAnalysisEnum: 346 349 pe=CreatePVectorAdjointHoriz(); 347 350 break; 351 #endif 348 352 default: 349 353 _error_("analysis %i (%s) not supported yet",analysis_type,EnumToStringx(analysis_type)); … … 429 433 430 434 /*Icefront numerics: */ 435 #ifdef _HAVE_DIAGNOSTIC_ 431 436 /*FUNCTION Icefront::CreatePVectorDiagnosticHoriz {{{1*/ 432 437 ElementVector* Icefront::CreatePVectorDiagnosticHoriz(void){ … … 449 454 _error_("Icefront type %s not supported yet",EnumToStringx(type)); 450 455 } 451 }452 /*}}}*/453 /*FUNCTION Icefront::CreatePVectorAdjointHoriz {{{1*/454 ElementVector* Icefront::CreatePVectorAdjointHoriz(void){455 456 /*No load vector applied to the adjoint*/457 return NULL;458 456 } 459 457 /*}}}*/ … … 536 534 } 537 535 /*}}}*/ 536 #endif 537 #ifdef _HAVE_CONTROL_ 538 /*FUNCTION Icefront::CreatePVectorAdjointHoriz {{{1*/ 539 ElementVector* Icefront::CreatePVectorAdjointHoriz(void){ 540 541 /*No load vector applied to the adjoint*/ 542 return NULL; 543 } 544 /*}}}*/ 545 #endif 538 546 #ifdef _HAVE_THREED_ 539 547 /*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{1*/ -
issm/trunk/src/c/objects/Loads/Icefront.h
r9777 r9785 80 80 /*}}}*/ 81 81 /*Load management: {{{1*/ 82 void GetDofList(int** pdoflist,int approximation_enum,int setenum); 83 void GetSegmentNormal(double* normal,double xyz_list[2][3]); 84 void GetQuadNormal(double* normal,double xyz_list[4][3]); 85 #ifdef _HAVE_CONTROL_ 82 86 ElementVector* CreatePVectorAdjointHoriz(void); 87 #endif 88 #ifdef _HAVE_DIAGNOSTIC_ 83 89 ElementVector* CreatePVectorDiagnosticHoriz(void); 84 90 ElementVector* CreatePVectorDiagnosticMacAyeal2d(void); 91 #endif 85 92 #ifdef _HAVE_THREED_ 86 93 ElementVector* CreatePVectorDiagnosticMacAyeal3d(void); … … 88 95 ElementVector* CreatePVectorDiagnosticStokes(void); 89 96 #endif 90 void GetDofList(int** pdoflist,int approximation_enum,int setenum);91 void GetSegmentNormal(double* normal,double xyz_list[2][3]);92 void GetQuadNormal(double* normal,double xyz_list[4][3]);93 97 /*}}}*/ 94 98 };
Note:
See TracChangeset
for help on using the changeset viewer.
