Changeset 18134
- Timestamp:
- 06/10/14 16:14:17 (11 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 2 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/Makefile.am
r18125 r18134 402 402 ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h\ 403 403 ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp\ 404 ./modules/Orthx/Orthx.h\405 ./modules/Orthx/Orthx.cpp\406 404 ./modules/Gradjx/Gradjx.h\ 407 405 ./modules/Gradjx/Gradjx.cpp\ … … 421 419 ./cores/controlm1qn3_core.cpp\ 422 420 ./cores/controlvalidation_core.cpp\ 423 ./cores/gradient_core.cpp\424 421 ./cores/adjointstressbalance_core.cpp\ 425 422 ./cores/adjointbalancethickness_core.cpp\ -
issm/trunk-jpl/src/c/cores/control_core.cpp
r18132 r18134 11 11 12 12 /*Local prototypes*/ 13 /*{{{*/ 13 14 IssmDouble FormFunction(IssmDouble* X,void* usr); 14 15 IssmDouble FormFunctionGradient(IssmDouble** pG,IssmDouble* X,void* usr); … … 17 18 int nsize; 18 19 } AppCtx; 19 20 void control_core(FemModel* femmodel){ 20 /*}}}*/ 21 22 void control_core(FemModel* femmodel){/*{{{*/ 21 23 22 24 int i; … … 122 124 xDelete<IssmDouble>(J); 123 125 xDelete<IssmDouble>(X0); 124 } 125 126 IssmDouble FormFunction(IssmDouble* X,void* usrvoid){ 126 }/*}}}*/ 127 IssmDouble FormFunction(IssmDouble* X,void* usrvoid){/*{{{*/ 127 128 128 129 /*output: */ … … 193 194 xDelete<IssmDouble>(Jlist); 194 195 return J; 195 } 196 IssmDouble FormFunctionGradient(IssmDouble** pG,IssmDouble* X,void* usrvoid){ 196 }/*}}}*/ 197 IssmDouble FormFunctionGradient(IssmDouble** pG,IssmDouble* X,void* usrvoid){/*{{{*/ 197 198 198 199 /*output: */ … … 300 301 *pG = G; 301 302 return J; 302 } 303 }/*}}}*/ -
issm/trunk-jpl/src/c/cores/cores.h
r18009 r18134 19 19 void adjointbalancethickness_core(FemModel* femmodel); 20 20 void adjointbalancethickness2_core(FemModel* femmodel); 21 void gradient_core(FemModel* femmodel,int n=0,bool orthogonalize=false);22 21 void stressbalance_core(FemModel* femmodel); 23 22 void hydrology_core(FemModel* femmodel); -
issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp
r18128 r18134 50 50 delete gradient_list[i]; 51 51 } 52 //gradient->Echo();53 //_error_("S");54 52 55 53 /*Check that gradient is clean*/ -
issm/trunk-jpl/src/c/modules/modules.h
r18093 r18134 68 68 #include "./NodeConnectivityx/NodeConnectivityx.h" 69 69 #include "./NodesDofx/NodesDofx.h" 70 #include "./Orthx/Orthx.h"71 70 #include "./OutputDefinitionsResponsex/OutputDefinitionsResponsex.h" 72 71 #include "./OutputResultsx/OutputResultsx.h"
Note:
See TracChangeset
for help on using the changeset viewer.