From 0a92d4a9b700a38b465b78caa88a1f894bd26219 Mon Sep 17 00:00:00 2001 From: caremoli Date: Thu, 1 Jul 2010 06:59:50 +0000 Subject: [PATCH] CCAR: update from V5_1_main branch --- doc/salome/gui/doxyfile.in | 2 +- salome_adm/cmake_files/am2cmake.py | 75 +++++++++++++++++++++-- src/Container/SALOME_ContainerManager.cxx | 5 ++ src/Launcher/Launcher_Job.cxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx | 14 ++++- 5 files changed, 89 insertions(+), 9 deletions(-) diff --git a/doc/salome/gui/doxyfile.in b/doc/salome/gui/doxyfile.in index e44cb36de..982691a60 100644 --- a/doc/salome/gui/doxyfile.in +++ b/doc/salome/gui/doxyfile.in @@ -249,4 +249,4 @@ DOT_CLEANUP = YES #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- -SEARCHENGINE = NO +SEARCHENGINE = YES diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py index 8dafe3ee7..19ced5ac6 100644 --- a/salome_adm/cmake_files/am2cmake.py +++ b/salome_adm/cmake_files/am2cmake.py @@ -306,20 +306,31 @@ class CMakeFile(object): "TransformationGUI", ] med_list = [ - "InterpGeometric2DAlg", - "interpkernelbases", "interpkernel", + "InterpKernelTest", "MEDClientcmodule", + "medcouplingclient", + "medcouplingcorba", + "medcouplingremapper", "medcoupling", "MEDEngine", + "medloader", + "MEDMEMCppTest", "MEDMEMImpl", "medmem", "MED", + "medsplitter", + "MEDSPLITTERTest", "med_V2_1", "MEDWrapperBase", "MEDWrapper", "MEDWrapper_V2_1", "MEDWrapper_V2_2", + "paramedcouplingcorba", + "paramedloader", + "paramedmemcompo", + "paramedmem", + "ParaMEDMEMTest", "SalomeIDLMED", ] smesh_list = [ @@ -575,6 +586,13 @@ class CMakeFile(object): INCLUDE(${CMAKE_SOURCE_DIR}/adm/cmake/FindGRAPHVIZ.cmake) """) pass + if self.module == "hxx2salome": + newlines.append(""" + SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR}) + INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMEDFILE.cmake) + INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake) + """) + pass pass pass # -- @@ -652,6 +670,15 @@ class CMakeFile(object): ENDIF(GUI_ROOT_DIR) """) pass + elif self.module == "netgen": + newlines.append(""" + SET(OCCFLAGS ${CAS_CPPFLAGS}) + SET(OCCLIBS ${CAS_LDPATH}) + SET(OCCLIBS ${OCCLIBS} ${TKernel} ${TKGeomBase} ${TKMath} ${TKG2d} ${TKG3d} ${TKXSBase} ${TKOffset} ${TKFillet} ${TKShHealing}) + SET(OCCLIBS ${OCCLIBS} ${TKMesh} ${TKMeshVS} ${TKTopAlgo} ${TKGeomAlgo} ${TKBool} ${TKPrim} ${TKBO} ${TKIGES} ${TKBRep}) + SET(OCCLIBS ${OCCLIBS} ${TKSTEPBase} ${TKSTEP} ${TKSTL} ${TKSTEPAttr} ${TKSTEP209} ${TKXDESTEP} ${TKXDEIGES} ${TKXCAF} ${TKLCAF} ${FWOSPlugin}) + """) + pass elif self.module == "netgenplugin": newlines.append(""" IF(GUI_ROOT_DIR) @@ -705,7 +732,11 @@ class CMakeFile(object): SET(AM_CXXFLAGS) SET(LDADD) """) - if self.module == "kernel": + if self.module == "netgen": + newlines.append(r''' + SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DNO_PARALLEL_THREADS -DOCCGEOMETRY -I${CMAKE_BINARY_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}) + ''') + elif self.module == "kernel": newlines.append(r''' SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${CMAKE_BINARY_DIR}/salome_adm/unix -include SALOMEconfig.h) SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${CMAKE_BINARY_DIR}/salome_adm/unix -include SALOMEconfig.h) @@ -1241,6 +1272,14 @@ class CMakeFile(object): "doc_DATA" : "${docdir}", } pass + if self.module == "netgen": + d = { + "include_HEADERS" : "include", + "noinst_HEADERS" : "share/netgen/include", + "dist_pkgdata_DATA" : "share/netgen", + "dist_doc_DATA" : "share/doc/netgen", + } + pass for key, value in d.items(): if self.__thedict__.has_key(key): self.addInstallTarget(key, value, newlines) @@ -1566,8 +1605,29 @@ class CMakeFile(object): # -- self.setLibAdd(key, newlines) # -- - if key != "noinst_LTLIBRARIES": - if self.module == "medfile": + if 1: # key != "noinst_LTLIBRARIES": + newlines.append(r''' + SET(key %s) + '''%(key)) + newlines.append(r''' + SET(test ON) + IF(${key} STREQUAL noinst_LTLIBRARIES) + SET(test OFF) + ENDIF(${key} STREQUAL noinst_LTLIBRARIES) + ''') + if self.module == "netgen" : + newlines.append(r''' + IF(${key} STREQUAL noinst_LTLIBRARIES) + IF(WINDOWS) + SET(test ON) + ENDIF(WINDOWS) + ENDIF(${key} STREQUAL noinst_LTLIBRARIES) + ''') + pass + newlines.append(r''' + IF(test) + ''') + if self.module in ["medfile", "netgen"]: newlines.append(r''' SET(DEST lib) ''') @@ -1644,6 +1704,9 @@ class CMakeFile(object): newlines.append(r''' ENDIF(BEGIN_WITH_lib) ''') + newlines.append(r''' + ENDIF(test) + ''') pass # -- newlines.append(r''' @@ -1692,7 +1755,7 @@ class CMakeFile(object): # -- self.setLibAdd(key, newlines) # -- - if self.module == "medfile": + if self.module in ["medfile", "netgen"]: newlines.append(r''' SET(DEST bin) ''') diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx index 8412d2f91..81fdcccc0 100644 --- a/src/Container/SALOME_ContainerManager.cxx +++ b/src/Container/SALOME_ContainerManager.cxx @@ -86,6 +86,11 @@ SALOME_ContainerManager::SALOME_ContainerManager(CORBA::ORB_ptr orb, PortableSer #ifdef HAVE_MPI2 #ifdef WITHOPENMPI + std::string urifile = getenv("HOME"); + std::ostringstream mypid; + mypid << getpid(); + urifile += "/.urifile_" + mypid.str(); + setenv("OMPI_URI_FILE",urifile.c_str(),0); if( getenv("OMPI_URI_FILE") != NULL ){ system("killall ompi-server"); std::string command; diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx index 53b3c0e33..7096e20ae 100644 --- a/src/Launcher/Launcher_Job.cxx +++ b/src/Launcher/Launcher_Job.cxx @@ -482,7 +482,7 @@ Launcher::Job::common_job_params() // Time if (_maximum_duration_in_second != -1) - params[Batch::MAXWALLTIME] = _maximum_duration_in_second; + params[Batch::MAXWALLTIME] = _maximum_duration_in_second / 60; // Queue if (_queue != "") diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx index 3e18369b1..3c10982e2 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx @@ -51,6 +51,15 @@ #define VARIABLE_SEPARATOR ':' #define OPERATION_SEPARATOR '|' +#include +static long tcount=0; +static long cumul; +static timeval tv; +#define START_TIMING gettimeofday(&tv,0);long tt0=tv.tv_usec+tv.tv_sec*1000000; +#define END_TIMING(NUMBER) \ + tcount=tcount+1;gettimeofday(&tv,0);cumul=cumul+tv.tv_usec+tv.tv_sec*1000000 -tt0; \ + if(tcount==NUMBER){ std::cerr < SALOMEDSImpl_Study::GetIORs() //============================================================================ bool SALOMEDSImpl_Study::addSO_Notification (const SALOMEDSImpl_SObject& theSObject) { - return _notifier->addSO_Notification(theSObject); + START_TIMING; + bool ret= _notifier->addSO_Notification(theSObject); + END_TIMING(100); + return ret; } //============================================================================ -- 2.39.2