Changeset 12696
- Timestamp:
- 07/23/12 16:24:52 (13 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 7 added
- 4 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h
r12677 r12696 149 149 SettingsResultsAsPatchesEnum, 150 150 SettingsWaitonlockEnum, 151 DebugP etscProfilingEnum,152 P etscProfilingCurrentMemEnum,153 P etscProfilingCurrentFlopsEnum,154 P etscProfilingSolutionTimeEnum,151 DebugProfilingEnum, 152 ProfilingCurrentMemEnum, 153 ProfilingCurrentFlopsEnum, 154 ProfilingSolutionTimeEnum, 155 155 MaxIterationConvergenceFlagEnum, 156 156 SteadystateMaxiterEnum, -
issm/trunk-jpl/src/c/Makefile.am
r12677 r12696 209 209 ./shared/Wrapper/ModuleBoot.cpp\ 210 210 ./shared/Wrapper/ModuleEnd.cpp\ 211 ./shared/Sys/sys.h\ 212 ./shared/Sys/ProfilingStart.cpp\ 213 ./shared/Sys/ProfilingEnd.cpp\ 211 214 ./toolkits/metis/metisincludes.h\ 212 215 ./toolkits/issm/issmtoolkit.h\ -
issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp
r12677 r12696 154 154 case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches"; 155 155 case SettingsWaitonlockEnum : return "SettingsWaitonlock"; 156 case DebugP etscProfilingEnum : return "DebugPetscProfiling";157 case P etscProfilingCurrentMemEnum : return "PetscProfilingCurrentMem";158 case P etscProfilingCurrentFlopsEnum : return "PetscProfilingCurrentFlops";159 case P etscProfilingSolutionTimeEnum : return "PetscProfilingSolutionTime";156 case DebugProfilingEnum : return "DebugProfiling"; 157 case ProfilingCurrentMemEnum : return "ProfilingCurrentMem"; 158 case ProfilingCurrentFlopsEnum : return "ProfilingCurrentFlops"; 159 case ProfilingSolutionTimeEnum : return "ProfilingSolutionTime"; 160 160 case MaxIterationConvergenceFlagEnum : return "MaxIterationConvergenceFlag"; 161 161 case SteadystateMaxiterEnum : return "SteadystateMaxiter"; -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp
r12677 r12696 57 57 parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum)); 58 58 parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum)); 59 parameters->AddObject(iomodel->CopyConstantObject(DebugP etscProfilingEnum));59 parameters->AddObject(iomodel->CopyConstantObject(DebugProfilingEnum)); 60 60 parameters->AddObject(iomodel->CopyConstantObject(MeshAverageVertexConnectivityEnum)); 61 61 parameters->AddObject(iomodel->CopyConstantObject(ConstantsReferencetemperatureEnum)); -
issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp
r12684 r12696 158 158 else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum; 159 159 else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; 160 else if (strcmp(name,"DebugP etscProfiling")==0) return DebugPetscProfilingEnum;161 else if (strcmp(name,"P etscProfilingCurrentMem")==0) return PetscProfilingCurrentMemEnum;162 else if (strcmp(name,"P etscProfilingCurrentFlops")==0) return PetscProfilingCurrentFlopsEnum;163 else if (strcmp(name,"P etscProfilingSolutionTime")==0) return PetscProfilingSolutionTimeEnum;160 else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum; 161 else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum; 162 else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum; 163 else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum; 164 164 else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum; 165 165 else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; -
issm/trunk-jpl/src/c/shared/shared.h
r12435 r12696 9 9 #include "Alloc/alloc_module.h" 10 10 #include "Alloc/xNewDelete.h" 11 #include "MemOps/xMemCpy.h" 11 #include "Bamg/shared.h" 12 #include "Elements/elements.h" 12 13 #include "Exceptions/exceptions.h" 13 14 #include "Exp/exp.h" 15 #include "Matrix/matrix.h" 16 #include "MemOps/xMemCpy.h" 17 #include "Numerics/numerics.h" 18 #include "Sorting/sorting.h" 19 #include "Sys/sys.h" 20 #include "Threads/issm_threads.h" 14 21 #include "TriMesh/trimesh.h" 15 #include "Sorting/sorting.h"16 #include "Elements/elements.h"17 #include "Matrix/matrix.h"18 #include "Numerics/numerics.h"19 #include "Threads/issm_threads.h"20 #include "Bamg/shared.h"21 22 #include "Wrapper/wrappershared.h" 22 23 -
issm/trunk-jpl/src/c/solutions/issm.cpp
r12655 r12696 35 35 int ierr; 36 36 37 /* PETScprofiling*/38 bool p etsc_profiling = false;39 PetscLogDouble petscTime_start, petscTime_finish;40 PetscLogDouble petsc_memUse, petscFlops_start, petscFlops_finish;37 /*profiling*/ 38 bool profiling = false; 39 IssmPDouble Time_start, Flops_start; 40 IssmPDouble Solution_time, Memory_use, Current_flops; 41 41 42 42 ISSMBOOT(); … … 99 99 femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum); 100 100 femmodel->parameters->FindParam(&tao_analysis,InversionTaoEnum); 101 femmodel->parameters->FindParam(&petsc_profiling,DebugPetscProfilingEnum);101 femmodel->parameters->FindParam(&profiling,DebugProfilingEnum); 102 102 103 103 #ifdef _HAVE_MPI_ … … 114 114 #endif 115 115 116 if(petsc_profiling){ 117 PetscGetTime(&petscTime_start); 118 PetscGetFlops(&petscFlops_start); 119 } 116 if(profiling)ProfilingStart(&Time_start,&Flops_start); 120 117 121 118 if(dakota_analysis){ … … 140 137 } 141 138 142 if(petsc_profiling){ 143 PetscGetTime(&petscTime_finish); 144 PetscGetFlops(&petscFlops_finish); 145 PetscMemoryGetCurrentUsage(&petsc_memUse); 146 147 _pprintLine_("PETSc elapsed time : " << (petscTime_finish-petscTime_start) << " Seconds"); 148 _pprintLine_("PETSc elapsed flops : " << (petscFlops_finish-petscFlops_start) << " Flops"); 149 _pprintLine_("PETSc memory used : " << petsc_memUse << " Bytes"); 150 151 femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingSolutionTimeEnum, (petscTime_finish-petscTime_start), 1, 0)); 152 femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingCurrentMemEnum, petsc_memUse, 1, 0)); 153 femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingCurrentFlopsEnum, (petscFlops_finish-petscFlops_start), 1, 0)); 154 } 139 if(profiling){ 140 ProfilingEnd(&Solution_time,&Memory_use,&Current_flops,Time_start,Flops_start); 141 femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingSolutionTimeEnum, Solution_time, 1, 0)); 142 femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingCurrentMemEnum, Memory_use, 1, 0)); 143 femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingCurrentFlopsEnum, Current_flops, 1, 0)); 144 } 145 155 146 156 147 #ifdef _HAVE_MPI_ -
issm/trunk-jpl/src/m/classes/debug.m
r11958 r12696 8 8 valgrind = false; 9 9 gprof = false; 10 p etsc_profiling = false;10 profiling = false; 11 11 end 12 12 methods … … 27 27 fielddisplay(obj,'valgrind','use Valgrind to debug (0 or 1)'); 28 28 fielddisplay(obj,'gprof','use gnu-profiler to find out where the time is spent'); 29 fielddisplay(obj,'p etsc_profiling','enables PETScprofiling (memory, flops, time)');29 fielddisplay(obj,'profiling','enables profiling (memory, flops, time)'); 30 30 31 31 end % }}} 32 32 function marshall(obj,fid) % {{{ 33 WriteData(fid,'object',obj,'fieldname','p etsc_profiling','format','Boolean');33 WriteData(fid,'object',obj,'fieldname','profiling','format','Boolean'); 34 34 end % }}} 35 35 end -
issm/trunk-jpl/src/m/enum/EnumDefinitions.py
r12685 r12696 1377 1377 return StringToEnum('SettingsWaitonlock') 1378 1378 1379 def DebugP etscProfilingEnum():1380 """ 1381 DEBUGP ETSCPROFILINGENUM - Enum of DebugPetscProfiling1382 1383 Usage: 1384 macro=DebugP etscProfilingEnum()1385 """ 1386 1387 return StringToEnum('DebugP etscProfiling')1388 1389 def P etscProfilingCurrentMemEnum():1390 """ 1391 P ETSCPROFILINGCURRENTMEMENUM - Enum of PetscProfilingCurrentMem1392 1393 Usage: 1394 macro=P etscProfilingCurrentMemEnum()1395 """ 1396 1397 return StringToEnum('P etscProfilingCurrentMem')1398 1399 def P etscProfilingCurrentFlopsEnum():1400 """ 1401 P ETSCPROFILINGCURRENTFLOPSENUM - Enum of PetscProfilingCurrentFlops1402 1403 Usage: 1404 macro=P etscProfilingCurrentFlopsEnum()1405 """ 1406 1407 return StringToEnum('P etscProfilingCurrentFlops')1408 1409 def P etscProfilingSolutionTimeEnum():1410 """ 1411 P ETSCPROFILINGSOLUTIONTIMEENUM - Enum of PetscProfilingSolutionTime1412 1413 Usage: 1414 macro=P etscProfilingSolutionTimeEnum()1415 """ 1416 1417 return StringToEnum('P etscProfilingSolutionTime')1379 def DebugProfilingEnum(): 1380 """ 1381 DEBUGPROFILINGENUM - Enum of DebugProfiling 1382 1383 Usage: 1384 macro=DebugProfilingEnum() 1385 """ 1386 1387 return StringToEnum('DebugProfiling') 1388 1389 def ProfilingCurrentMemEnum(): 1390 """ 1391 PROFILINGCURRENTMEMENUM - Enum of ProfilingCurrentMem 1392 1393 Usage: 1394 macro=ProfilingCurrentMemEnum() 1395 """ 1396 1397 return StringToEnum('ProfilingCurrentMem') 1398 1399 def ProfilingCurrentFlopsEnum(): 1400 """ 1401 PROFILINGCURRENTFLOPSENUM - Enum of ProfilingCurrentFlops 1402 1403 Usage: 1404 macro=ProfilingCurrentFlopsEnum() 1405 """ 1406 1407 return StringToEnum('ProfilingCurrentFlops') 1408 1409 def ProfilingSolutionTimeEnum(): 1410 """ 1411 PROFILINGSOLUTIONTIMEENUM - Enum of ProfilingSolutionTime 1412 1413 Usage: 1414 macro=ProfilingSolutionTimeEnum() 1415 """ 1416 1417 return StringToEnum('ProfilingSolutionTime') 1418 1418 1419 1419 def MaxIterationConvergenceFlagEnum():
Note:
See TracChangeset
for help on using the changeset viewer.