Changeset 25711
- Timestamp:
- 10/22/20 16:15:12 (4 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/externalpackages/boost/configs/1.73/boost/math/tools/user.hpp
r25706 r25711 20 20 // or if the long double versions have only double precision: 21 21 // 22 #define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS22 // #define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS 23 23 // 24 24 // Performance tuning options: -
issm/trunk-jpl/src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp
r25688 r25711 669 669 _printf0_("Done aggregating time mean histogram:\n"); 670 670 IssmComm::SetComm(ISSM_MPI_COMM_WORLD); 671 672 return 1; 671 673 } 672 674 /*}}}*/ … … 1004 1006 IssmComm::SetComm(ISSM_MPI_COMM_WORLD); 1005 1007 1008 return 1; 1006 1009 } /*}}}*/ 1007 1010 int ComputeSampleSeries(Parameters* parameters,Results* results,int color, ISSM_MPI_Comm statcomm){ /*{{{*/ … … 1164 1167 IssmComm::SetComm(ISSM_MPI_COMM_WORLD); 1165 1168 1169 return 1; 1166 1170 } /*}}}*/ 1167 1171 int OutputStatistics(Parameters* parameters,Results* results,int color,ISSM_MPI_Comm statcomm){ /*{{{*/ … … 1197 1201 1198 1202 OutputResultsx(femmodel); 1203 1204 return 1; 1199 1205 } /*}}}*/ 1200 1206 bool DakotaDirStructure(int argc,char** argv){ /*{{{*/ … … 1231 1237 if(!statistics){ 1232 1238 delete iomodel; 1233 fclose(fid); 1239 xDelete<char>(input_file); 1240 fclose(fid); 1234 1241 return false; //important return value! 1235 1242 } … … 1247 1254 } 1248 1255 } 1256 1257 /*Delete resources:*/ 1258 delete iomodel; 1259 xDelete<char>(input_file); 1249 1260 1250 1261 //close model file: … … 1307 1318 if(!statistics){ 1308 1319 delete iomodel; 1320 xDelete<char>(input_file); 1309 1321 fclose(fid); 1310 1322 return 0; 1311 } 1312 1313 //create parameters datasets with al the qmu statistics settings we need: 1314 if(statistics){ 1323 }else{ 1324 //create parameters datasets with al the qmu statistics settings we need: 1315 1325 1316 1326 /*Initialize parameters and results:*/ … … 1389 1399 else _error_(" error creating qmu statistics methods parameters: unsupported method " << name); 1390 1400 } 1401 1402 /*Delete resources:*/ 1403 xDelete<char>(input_file); 1404 delete iomodel; 1391 1405 } 1406 1392 1407 //close model file: 1393 1408 fclose(fid); … … 1399 1414 ISSM_MPI_Barrier(ISSM_MPI_COMM_WORLD); _printf0_("Output file.\n"); 1400 1415 1401 /*Delete res sources:*/1416 /*Delete resources:*/ 1402 1417 delete parameters; 1403 1418 delete results; 1404 1419 1405 1406 1420 return 1; 1407 1421 } /*}}}*/
Note:
See TracChangeset
for help on using the changeset viewer.