diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml new file mode 100644 index 00000000..9ec01df8 --- /dev/null +++ b/.github/workflows/cmake.yml @@ -0,0 +1,84 @@ +name: CMake + +on: [workflow_dispatch, push, pull_request] + + +concurrency: + group: FC-CI-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build: + # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. + # You can convert this to a matrix build if you need cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + runs-on: ubuntu-22.04 + env: + CPM_SOURCE_CACHE: ~/.cache/CPM + steps: + - uses: actions/checkout@v3 + - name: Install I-SIMPA dependencies + run: | + sudo sed -i 's/azure\.//' /etc/apt/sources.list + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + build-essential \ + libgtk-3-dev \ + freeglut3-dev \ + libxmu-dev \ + libxi-dev \ + libpng-dev \ + libjpeg-dev \ + libxxf86vm1 \ + libxxf86vm-dev \ + libxi-dev \ + libxrandr-dev \ + mesa-common-dev \ + mesa-utils \ + libgl1-mesa-dev \ + libglapi-mesa \ + byacc \ + gettext \ + cmake \ + python3-dev \ + swig \ + libboost-all-dev + - name: Cache CPM dependency packages + uses: actions/cache@v3 + with: + path: | + ${{ env.CPM_SOURCE_CACHE }} + key: ${{ runner.os }}-isimpa + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: | + cmake -DCPM_SOURCE_CACHE=${{ env.CPM_SOURCE_CACHE }} -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + working-directory: ${{github.workspace}}/build + # Compile i-simpa + run: make + + - name: Install + working-directory: ${{github.workspace}}/build + # Copy stuff to bin subdirectory for "standalone" application + run: make install + + - name: Test + working-directory: ${{github.workspace}}/build + # Execute tests defined by the CMake configuration. + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: make test + + - name: Archive production artifacts + uses: actions/upload-artifact@v3 + with: + name: isimpa-amd64.zip + path: ${{github.workspace}}/build/bin + diff --git a/.gitignore b/.gitignore index d74a7ee0..eee8348b 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,5 @@ files.txt *.pot # cmake should convert .po files into .mo files if necessary *.mo -.vscode/ \ No newline at end of file +.vscode +.DS_Store diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c991e91..3f9e41e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,13 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.6.0) +# begin basic metadata +# minimum CMake version required for C++20 support, among other things +cmake_minimum_required(VERSION 3.15) # Maps to a solution file (isimpa.sln). The solution will # have all targets (exe, lib, dll) as projects (.vcproj) project (isimpa VERSION 1.3.4) +# a better way to load dependencies +include(cmake/CPM.cmake) # convert path of a .lib file into a .dll file # findboost does not store .dll locations @@ -49,13 +53,15 @@ IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU") EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) IF (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7) SET(USE_CXX_11 TRUE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall --std=c++11 -O3 -fPIC" ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -fPIC" ) ENDIF() ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang") IF ((NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.2") OR (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.1")) SET(USE_CXX_11 TRUE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error=c++11-narrowing") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall --std=c++11 -Wno-error=c++11-narrowing -O3 -fPIC" ) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -fPIC" ) ENDIF() ELSEIF (MSVC AND MSVC_VERSION GREATER 1600) SET(USE_CXX_11 TRUE) diff --git a/Docs/Building.md b/Docs/Building.md index 44ba3400..3399ddd0 100644 --- a/Docs/Building.md +++ b/Docs/Building.md @@ -10,10 +10,10 @@ #### Software & Dependencies requirements * CMake -* Boost 1.60 -* wxWidget 3.1.0 -* Swig -* Python 2.7 +* Boost 1.73 +* wxWidget 3.1.4 +* Swig 3.0.11 +* Python 3.8 :warning: This project uses OpenGL, check if your graphic driver is up to date ! @@ -21,22 +21,22 @@ ### On Windows with Microsoft Visual Studio (64bits) -Last (free) version in date : [Visual Studio Community 2015](https://www.visualstudio.com/) +Last (free) version in date : [Visual Studio Community 2019](https://www.visualstudio.com/) #### Libraries installation We recommend you to create a lib folder in `C:` and to use it when extracting extracting externals libraries source. * **Boost** - * [Download Boost 1.60](http://www.boost.org/users/history/) + * [Download Boost 1.73](http://www.boost.org/users/history/) * Extract the archive * To build Boost : from the Visual Studio shell (Menu > All Programs > Visual Studio Tools), in the Boost folder .\bootstrap.bat # build just what we need - .\b2. toolset=msvc-14.0 --with-thread --with-random --with-python --with-date_time --with-test --with-filesystem --with-regex --build-type=complete stage + .\b2. toolset=msvc-16.0 --with-thread --with-random --with-python --with-date_time --with-test --with-filesystem --with-regex --build-type=complete stage # or everything - .\b2. toolset=msvc-14.0 --build-type=complete stage + .\b2. toolset=msvc-16.0 --build-type=complete stage * Move the lib/ folder (inside stage/) to the Boost folder root * Create/check environment variable @@ -49,9 +49,9 @@ We recommend you to create a lib folder in `C:` and to use it when extracting ex * Extract the archive * Add to Path the Swig folder path * **wxWidgets** - * [Download the wxWidget 3.1.0 Windows Installer](http://www.wxwidgets.org/downloads/) + * [Download the wxWidget 3.1.4 Windows Installer](http://www.wxwidgets.org/downloads/) * The installer extract the source in a folder - * In the wxWidget folder, in build/msw, launch wx_vc14.sl + * In the wxWidget folder, in build/msw, launch wx_vc16.sl * Choose the "debug" mode and generate the solution * Choose the "release" mode and generate the solution again * Quit Visual Studio @@ -60,7 +60,7 @@ We recommend you to create a lib folder in `C:` and to use it when extracting ex WXWIN path\to\wxwidget * **Python** - * [Download Python 2.7](https://www.python.org/downloads/) + * [Download Python 3.8](https://www.python.org/downloads/) * Install it (the installer has an option that can do the two next steps for you) * Add to Path the Python installation folder path * Create/check environment variable @@ -89,7 +89,7 @@ In order to build under linux you have to download/install the following librari - gcc-4.8 - g++-4.8 -- python 2.7 +- python 3.8 - freeglut3-dev - libxmu-dev - libxi-dev @@ -111,13 +111,13 @@ Swig from here: https://github.com/swig/swig/archive/rel-3.0.10.tar.gz Boost from here: -https://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.bz2 +https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.bz2/download wxWidgets from here: -https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2 +https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.tar.bz2 -Cmake from here -https://cmake.org/files/v3.6/cmake-3.6.1-Linux-x86_64.tar.gz +Cmake from here (or from apt-get) +https://cmake.org/files/LatestRelease/cmake-3.22.0.tar.gz #### Building instructions diff --git a/Docs/code_TCR.rst b/Docs/code_TCR.rst index f4a22552..4b4b0702 100644 --- a/Docs/code_TCR.rst +++ b/Docs/code_TCR.rst @@ -3,7 +3,7 @@ Presentation **TCR is a numerical code based on the Classical Theory or Reverberation.** -- `Visit the offical I-Simpa website`_ for more information about SPPS code. +- `Visit the offical I-Simpa website`_ for more information about TCR code. - See the main `characteristics of the code`_ that is embedded in I-Simpa. diff --git a/Docs/index.rst b/Docs/index.rst index ddb4fba2..1b116007 100644 --- a/Docs/index.rst +++ b/Docs/index.rst @@ -36,15 +36,16 @@ the TCR numerical codes (embedded within the I-Simpa software). `instructions`_ .. note:: - - Some illustrations may referred to previous versions of I-Simpa. - - Depending of your OS, screenchots may differs. - - Some texts and translations in I-Simpa may have changed. - - If the present documentation is the 'Offline documentation' you may refer to the online version at http://i-simpa-wiki.readthedocs.io/fr/latest/ for an up-to-date documentation. - - If you observe some mistakes or errors, please `write an Issue on GitHub`_ - - You can also `contribute to the documentation`_. - - The official documentation is available in English only. - -.. _visit the offical I-Simpa website: https://i-simpa.univ-gustave-eiffel.fr/ + - This user guide is currently not complete. Additions are underway. + - Some illustrations may referred to previous versions of I-Simpa. + - Depending of your OS, screenchots may differs. + - Some texts and translations in I-Simpa may have changed. + - If the present documentation is the 'Offline documentation' you may refer to the online version at http://i-simpa-wiki.readthedocs.io/en/latest/ for an up-to-date documentation. + - If you observe some mistakes or errors, please `write an Issue on GitHub`_ + - You can also `contribute to the documentation`_. + - The official documentation is available in English only. + +.. _visit the offical I-Simpa website: http://i-simpa.ifsttar.fr .. _instructions: https://github.com/Ifsttar/I-Simpa/wiki .. _contribute to the documentation: https://github.com/Ifsttar/I-Simpa/wiki/Write-documentation .. _write an Issue on GitHub: https://github.com/Ifsttar/I-Simpa/issues @@ -111,7 +112,6 @@ the TCR numerical codes (embedded within the I-Simpa software). :maxdepth: 2 :caption: Appendices - errors_messages I_Simpa_standard room_acoustics_parameters glossary diff --git a/Docs/presentation.rst b/Docs/presentation.rst index cc027394..3fe14bf8 100644 --- a/Docs/presentation.rst +++ b/Docs/presentation.rst @@ -20,14 +20,14 @@ Windows properties: - User can **rearrange and resize** all components in the computer screen by selecting and moving the corresponding component. - You can come back to the **default view** by selecting the option 'Reinitialize interface' in the 'Windows' menu. -.. _'File': Menu_File.html -.. _'Edition': Menu_Edition.html -.. _'Simulation': Menu_Simulation.html -.. _'View': Menu_View.html -.. _'Windows': Menu_Windows.html -.. _'Help': Menu_Help.html -.. _'Toolbars': Toolbars.html -.. _'Project' window: Project_window.html -.. _'Properties' window: Properties_window.html -.. _'Console' window: Console_window.html -.. _'Main' window: Main_window.html +.. _'File': menu_file.html +.. _'Edition': menu_edition.html +.. _'Simulation': menu_simulation.html +.. _'View': menu_view.html +.. _'Windows': menu_windows.html +.. _'Help': menu_help.html +.. _'Toolbars': toolbars.html +.. _'Project' window: project_window.html +.. _'Properties' window: properties_window.html +.. _'Console' window: console_window.html +.. _'Main' window: main_window.html diff --git a/Docs/requirements.txt b/Docs/requirements.txt index 7af3d88e..3c490d8b 100644 --- a/Docs/requirements.txt +++ b/Docs/requirements.txt @@ -1,2 +1 @@ sphinxcontrib-bibtex==1.0.0 -docutils==0.16 diff --git a/appveyor.yml b/appveyor.yml index 6dd862f0..1075ce23 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,21 +12,15 @@ environment: BOOST_LIBRARYDIR: C:\Libraries\boost_1_73_0\lib64-msvc-14.2 PYTHON_LIBRARY: C:\Python38-x64\libs\python38.lib PYTHON_INCLUDE_DIR: C:\Python38-x64\include - WXWIN: C:\wxWidgets-3.1.4\ - wxWidgets_ROOT_DIR: C:\wxWidgets-3.1.4\ - wxWidgets_INCLUDE_DIRS: C:\wxWidgets-3.1.4\include - wxWidgets_LIBRARIES: C:\wxWidgets-3.1.4\lib\vc14x_x64_dll - SWIG_DIR: C:\Libraries\swigwin-3.0.11 - SWIG_EXECUTABLE: C:\Libraries\swigwin-3.0.11\swig.exe + WXWIN: C:\wxWidgets-3.1.5\ + wxWidgets_ROOT_DIR: C:\wxWidgets-3.1.5\ + wxWidgets_INCLUDE_DIRS: C:\wxWidgets-3.1.5\include + wxWidgets_LIBRARIES: C:\wxWidgets-3.1.5\lib\vc14x_x64_dll + SWIG_DIR: C:\ProgramData\chocolatey\lib\swig\tools + #SWIG_EXECUTABLE: C:\Libraries\swigwin-3.0.11\swig.exe PYTHON_EXECUTABLE: C:\Python38-x64\python.exe CTEST_OUTPUT_ON_FAILURE: 1 -# branches to build -branches: - # whitelist - only: - - master - # Operating system (build VM template) os: Visual Studio 2019 @@ -50,18 +44,19 @@ before_build: # Copy x64 dll from system32 to python27 x64 #- cmd: copy c:\windows\system32\PYTHON27.DLL C:\Python27-x64\python27.dll - echo Download wxWidgets lib - - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.7z' - - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxMSW-3.1.4_vc14x_x64_Dev.7z' - - cmd: 7z x -aoa wxWidgets-3.1.4.7z -oC:\wxWidgets-3.1.4 - - cmd: 7z x -aoa wxMSW-3.1.4_vc14x_x64_Dev.7z -oC:\wxWidgets-3.1.4 + - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxWidgets-3.1.5.7z' + - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxMSW-3.1.5_vc14x_x64_Dev.7z' + - cmd: 7z x -aoa wxWidgets-3.1.5.7z -oC:\wxWidgets-3.1.5 + - cmd: 7z x -aoa wxMSW-3.1.5_vc14x_x64_Dev.7z -oC:\wxWidgets-3.1.5 - cmd: dir %wxWidgets_LIBRARIES% # Download Release wxWidgets DLL's - - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxMSW-3.1.4_vc14x_x64_ReleaseDLL.7z' -Timeout 15000 - - cmd: 7z x -aoa wxMSW-3.1.4_vc14x_x64_ReleaseDLL.7z -oC:\wxWidgets-3.1.4 + - ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxMSW-3.1.5_vc14x_x64_ReleaseDLL.7z' -Timeout 15000 + - cmd: 7z x -aoa wxMSW-3.1.5_vc14x_x64_ReleaseDLL.7z -oC:\wxWidgets-3.1.5 # install dependencies: - choco install poedit nsis 7zip.install - - ps: Start-FileDownload 'https://github.com/nicolas-f/build_resources/raw/master/swigwin-3.0.11.zip' -FileName 'c:\Libraries\swigwin-3.0.11.zip' -Timeout 15000 - - ps: 7z x -aoa c:\Libraries\swigwin-3.0.11.zip -oC:\Libraries -r -y + #- ps: Start-FileDownload 'https://github.com/nicolas-f/build_resources/raw/master/swigwin-3.0.11.zip' -FileName 'c:\Libraries\swigwin-3.0.11.zip' -Timeout 15000 + #- ps: 7z x c:\Libraries\swigwin-3.0.11.zip -oC:\Libraries -r -y + - choco install swig - cmd: SET PATH=%PATH%;%WXWIN%;%SWIG_DIR%;%wxWidgets_LIB_DIR%;C:\Program Files (x86)\Poedit\Gettexttools\bin;%BOOST_LIBRARYDIR%; - ps: swig.exe -version - echo Running cmake... diff --git a/ci/travis/linux/after_script.sh b/ci/travis/linux/after_script.sh deleted file mode 100755 index 139597f9..00000000 --- a/ci/travis/linux/after_script.sh +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/ci/travis/linux/before_install.sh b/ci/travis/linux/before_install.sh deleted file mode 100755 index 5eb78e50..00000000 --- a/ci/travis/linux/before_install.sh +++ /dev/null @@ -1,55 +0,0 @@ -export DEBIAN_FRONTEND=noninteractive - -# -# Boost install - -if [ -d $HOME/boost-install/boost ] ; then - echo "Boost already built (and in travis cache)" -else - cd - wget https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.bz2 - tar -xjf boost_1_73_0.tar.bz2 --strip-components=1 -C $HOME/boost-install - ls -l $HOME/boost-install - cd $HOME/boost-install && echo "using python : 3.8 : /usr/bin/python3 : /usr/include/python3.8 : /usr/lib ;" > tools/build/src/user-config.jam - cd $HOME/boost-install && ./bootstrap.sh link=static variant=release address-model=64 cxxflags="-std=c++11 -fPIC" boost.locale.icu=off --with-libraries=filesystem,system,test,regex,python,random,thread,timer,date_time --prefix=$HOME/boost-install && ./b2 install -fi - -export BOOST_LIBRARYDIR=$HOME/boost-install/lib/ -export BOOST_INCLUDEDIR=$HOME/boost-install/ -export BOOST_ROOT=$HOME/boost-install/ - -# -# Swig install -if [ -f $HOME/swig-install/bin/swig ] ; then - echo "Swig already built (and in travis cache)" -else - cd - wget https://github.com/swig/swig/archive/rel-3.0.10.tar.gz - tar zxvf rel-3.0.10.tar.gz - mkdir $HOME/swig-install - cd $HOME/swig-rel-3.0.10 && ./autogen.sh && ./configure --prefix=$HOME/swig-install && make && make install -fi - -# -# WXWidget install - -if [ -d $HOME/wxWidgets-install/include ] ; then - echo "wxWidget already built (and in travis cache)" -else - cd - wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.tar.bz2 - tar -xjf wxWidgets-3.1.4.tar.bz2 - mkdir $HOME/wxWidgets-install - cd $HOME/wxWidgets-3.1.4 && ./configure --prefix=$HOME/wxWidgets-install --disable-shared && make && make install -fi - -# check wxWidget install -export PATH=$HOME/wxWidgets-install/bin/:$PATH -echo "wxWidget version : " -wx-config --version - -# Download CMake -cd -wget --no-check-certificate https://cmake.org/files/v3.17/cmake-3.17.2-Linux-x86_64.tar.gz -mkdir $HOME/cmake-install -tar zxvf cmake-3.17.2-Linux-x86_64.tar.gz -C $HOME/cmake-install --strip 1 diff --git a/ci/travis/linux/before_script.sh b/ci/travis/linux/before_script.sh deleted file mode 100755 index c0a8bc05..00000000 --- a/ci/travis/linux/before_script.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash -# Update translation key files - -find src/isimpa -type f -regex '.*/.*\.\(c\|cpp\|h\|hpp\)$' > files.txt -find src/spps -type f -regex '.*/.*\.\(c\|cpp\|h\|hpp\)$' >> files.txt -find src/theorie_classique -type f -regex '.*/.*\.\(c\|cpp\|h\|hpp\)$' >> files.txt -find src/lib_interface -type f -regex '.*/.*\.\(c\|cpp\|h\|hpp\)$' >> files.txt - -mkdir -p src/isimpa/lang/ -xgettext --keyword=_ --keyword=wxTRANSLATE --from-code=UTF-8 -s --no-wrap -no-hash --escape -ffiles.txt -osrc/isimpa/lang/internat.pot -msginit --no-translator --input src/isimpa/lang/internat.pot -o src/isimpa/lang/internat.pot -l en.UTF-8 - -find currentRelease/SystemScript/job_tool -type f -name "*.py" > files.txt -xgettext --keyword=_ --from-code=UTF-8 -s --no-wrap -no-hash --escape -ffiles.txt -ocurrentRelease/SystemScript/job_tool/internat.pot -msginit --no-translator --input currentRelease/SystemScript/job_tool/internat.pot -o currentRelease/SystemScript/job_tool/internat.pot -l en.UTF-8 - -find currentRelease/SystemScript/moveto_vertex -type f -name "*.py" > files.txt -xgettext --keyword=_ --from-code=UTF-8 -s --no-wrap -no-hash --escape -ffiles.txt -ocurrentRelease/SystemScript/moveto_vertex/internat.pot -msginit --no-translator --input currentRelease/SystemScript/moveto_vertex/internat.pot -o currentRelease/SystemScript/moveto_vertex/internat.pot -l en.UTF-8 - -find currentRelease/SystemScript/preceiv_sourceTracker -type f -name "*.py" > files.txt -xgettext --keyword=_ --from-code=UTF-8 -s --no-wrap -no-hash --escape -ffiles.txt -ocurrentRelease/SystemScript/preceiv_sourceTracker/internat.pot -msginit --no-translator --input currentRelease/SystemScript/preceiv_sourceTracker/internat.pot -o currentRelease/SystemScript/preceiv_sourceTracker/internat.pot -l en.UTF-8 - -find currentRelease/SystemScript/recp_tool -type f -name "*.py" > files.txt -xgettext --keyword=_ --from-code=UTF-8 -s --no-wrap -no-hash --escape -ffiles.txt -ocurrentRelease/SystemScript/recp_tool/internat.pot -msginit --no-translator --input currentRelease/SystemScript/recp_tool/internat.pot -o currentRelease/SystemScript/recp_tool/internat.pot -l en.UTF-8 - -find currentRelease/SystemScript/source_tools -type f -name "*.py" > files.txt -xgettext --keyword=_ --from-code=UTF-8 -s --no-wrap -no-hash --escape -ffiles.txt -ocurrentRelease/SystemScript/source_tools/internat.pot -msginit --no-translator --input currentRelease/SystemScript/source_tools/internat.pot -o currentRelease/SystemScript/source_tools/internat.pot -l en.UTF-8 - -# Disabled -#find currentRelease/SystemScript/SppsReportSample -type f -name "*.py" > files.txt -#xgettext --keyword=_ --from-code=UTF-8 -s --no-wrap -no-hash --escape -ffiles.txt -ocurrentRelease/SystemScript/SppsReportSample/internat.pot -#msginit --no-translator --input currentRelease/SystemScript/SppsReportSample/internat.pot -o currentRelease/SystemScript/SppsReportSample/internat.pot -l en.UTF-8 - -# Now replace all ASCII charset by UTF-8 in pot files -find . -type f -name "*.pot" -exec sed -i 's/charset=ASCII/charset=UTF-8/g' {} + - -# Push translation keys to transifex -# Update setup-tools -pip install --user setuptools --upgrade -pip install --user urllib3 --force-reinstall --upgrade -# install transifex client (version 0.13 have an issue) -pip install --user transifex-client==0.12.5 -if [ -z "$TRANSIFEXPWD" ]; then - echo "Not in master branch do not push transifex keys" -else - # Write transifex config file - printf "[https://www.transifex.com]\nhostname = https://www.transifex.com\npassword = $TRANSIFEXPWD\ntoken =\nusername = travis_lae\n" > ~/.transifexrc - # push transifex keys - tx push -s -fi diff --git a/ci/travis/linux/install.sh b/ci/travis/linux/install.sh deleted file mode 100755 index f6ff675a..00000000 --- a/ci/travis/linux/install.sh +++ /dev/null @@ -1,18 +0,0 @@ -mkdir build -cd build - -CLANG_WARNINGS="" - -# wxWidget path (only in script scope) -export PATH=$HOME/wxWidgets-install/bin/:$HOME/swig-install/bin/:$HOME/cmake-install/bin/:$PATH -export BOOST_LIBRARYDIR=$HOME/boost-install/lib/ -export BOOST_INCLUDEDIR=$HOME/boost-install/ -export BOOST_ROOT=$HOME/boost-install/ - -cmake --version -${CC} --version -${CXX} --version - -ls $HOME/boost-install/lib/ - -cmake .. diff --git a/ci/travis/linux/script.sh b/ci/travis/linux/script.sh deleted file mode 100755 index 5210e801..00000000 --- a/ci/travis/linux/script.sh +++ /dev/null @@ -1,6 +0,0 @@ -cd build -pwd -make VERBOSE=1 -make install -export LD_LIBRARY_PATH=$HOME/boost-install/lib:$LD_LIBRARY_PATH -CTEST_OUTPUT_ON_FAILURE=1 make test diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake new file mode 100644 index 00000000..e9674a77 --- /dev/null +++ b/cmake/CPM.cmake @@ -0,0 +1,32 @@ +set(CPM_DOWNLOAD_VERSION 0.37.0) + +if(CPM_SOURCE_CACHE) + set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +elseif(DEFINED ENV{CPM_SOURCE_CACHE}) + set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +else() + set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +endif() + +# Expand relative path. This is important if the provided path contains a tilde (~) +get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE) + +function(download_cpm) + message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}") + file(DOWNLOAD + https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake + ${CPM_DOWNLOAD_LOCATION} + ) +endfunction() + +if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION})) + download_cpm() +else() + # resume download if it previously failed + file(READ ${CPM_DOWNLOAD_LOCATION} check) + if("${check}" STREQUAL "") + download_cpm() + endif() +endif() + +include(${CPM_DOWNLOAD_LOCATION}) diff --git a/currentRelease/ExperimentalCore/md_octave/md_octave.py b/currentRelease/ExperimentalCore/md_octave/md_octave.py index 68f59967..7f0ea035 100644 --- a/currentRelease/ExperimentalCore/md_octave/md_octave.py +++ b/currentRelease/ExperimentalCore/md_octave/md_octave.py @@ -77,16 +77,19 @@ def process_face(tetraface, modelImport, sharedVertices, fileOut): ## # \~english -# This method run the Classical physics core for each source independently and return the results +# This method runs the Classical physics core for each source independently and returns the results # @return Dict object with source id in key and sound_level_layer.SoundLevelLayer instance in dict values def runTC(xmlPathTc, coreconf): """ - This method run the Classical physics core for each source independently and return the results + This method runs the Classical physics core for each source independently and returns the results """ # TODO option to disable direct field computation #if not coreconf.const["ajouter_son_direct"]: # return {} + if platform.system() == 'Windows': tcpath = os.path.normpath(os.path.join(os.getcwd(), "core", "classical_theory", "classicalTheory.exe")) + else: + tcpath = os.path.normpath(os.path.join(os.getcwd(), "core", "classical_theory", "classicalTheory")) if not os.path.exists(tcpath): print("Cant find classical theory program!\n %s" % tcpath, file=sys.stderr) diff --git a/currentRelease/doc/documentation/Offline_documentation/html/.buildinfo b/currentRelease/doc/documentation/Offline_documentation/html/.buildinfo index 7bcdc0ed..140ec18e 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/.buildinfo +++ b/currentRelease/doc/documentation/Offline_documentation/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: d0d1c3ed07784eb067a6789eb9b0a19d +config: d2d1b65af3cb8bba0b4ef7502c8b4ab6 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/currentRelease/doc/documentation/Offline_documentation/html/I_Simpa_overview.html b/currentRelease/doc/documentation/Offline_documentation/html/I_Simpa_overview.html index e9873348..4c640551 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/I_Simpa_overview.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/I_Simpa_overview.html @@ -401,9 +401,9 @@
- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/I_Simpa_standard.html b/currentRelease/doc/documentation/Offline_documentation/html/I_Simpa_standard.html index 5b011075..c4e2b7f9 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/I_Simpa_standard.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/I_Simpa_standard.html @@ -291,9 +291,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/_sources/code_TCR.rst.txt b/currentRelease/doc/documentation/Offline_documentation/html/_sources/code_TCR.rst.txt index f4a22552..4b4b0702 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/_sources/code_TCR.rst.txt +++ b/currentRelease/doc/documentation/Offline_documentation/html/_sources/code_TCR.rst.txt @@ -3,7 +3,7 @@ Presentation **TCR is a numerical code based on the Classical Theory or Reverberation.** -- `Visit the offical I-Simpa website`_ for more information about SPPS code. +- `Visit the offical I-Simpa website`_ for more information about TCR code. - See the main `characteristics of the code`_ that is embedded in I-Simpa. diff --git a/currentRelease/doc/documentation/Offline_documentation/html/_sources/index.rst.txt b/currentRelease/doc/documentation/Offline_documentation/html/_sources/index.rst.txt index ddb4fba2..1b116007 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/_sources/index.rst.txt +++ b/currentRelease/doc/documentation/Offline_documentation/html/_sources/index.rst.txt @@ -36,15 +36,16 @@ the TCR numerical codes (embedded within the I-Simpa software). `instructions`_ .. note:: - - Some illustrations may referred to previous versions of I-Simpa. - - Depending of your OS, screenchots may differs. - - Some texts and translations in I-Simpa may have changed. - - If the present documentation is the 'Offline documentation' you may refer to the online version at http://i-simpa-wiki.readthedocs.io/fr/latest/ for an up-to-date documentation. - - If you observe some mistakes or errors, please `write an Issue on GitHub`_ - - You can also `contribute to the documentation`_. - - The official documentation is available in English only. - -.. _visit the offical I-Simpa website: https://i-simpa.univ-gustave-eiffel.fr/ + - This user guide is currently not complete. Additions are underway. + - Some illustrations may referred to previous versions of I-Simpa. + - Depending of your OS, screenchots may differs. + - Some texts and translations in I-Simpa may have changed. + - If the present documentation is the 'Offline documentation' you may refer to the online version at http://i-simpa-wiki.readthedocs.io/en/latest/ for an up-to-date documentation. + - If you observe some mistakes or errors, please `write an Issue on GitHub`_ + - You can also `contribute to the documentation`_. + - The official documentation is available in English only. + +.. _visit the offical I-Simpa website: http://i-simpa.ifsttar.fr .. _instructions: https://github.com/Ifsttar/I-Simpa/wiki .. _contribute to the documentation: https://github.com/Ifsttar/I-Simpa/wiki/Write-documentation .. _write an Issue on GitHub: https://github.com/Ifsttar/I-Simpa/issues @@ -111,7 +112,6 @@ the TCR numerical codes (embedded within the I-Simpa software). :maxdepth: 2 :caption: Appendices - errors_messages I_Simpa_standard room_acoustics_parameters glossary diff --git a/currentRelease/doc/documentation/Offline_documentation/html/_sources/presentation.rst.txt b/currentRelease/doc/documentation/Offline_documentation/html/_sources/presentation.rst.txt index cc027394..3fe14bf8 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/_sources/presentation.rst.txt +++ b/currentRelease/doc/documentation/Offline_documentation/html/_sources/presentation.rst.txt @@ -20,14 +20,14 @@ Windows properties: - User can **rearrange and resize** all components in the computer screen by selecting and moving the corresponding component. - You can come back to the **default view** by selecting the option 'Reinitialize interface' in the 'Windows' menu. -.. _'File': Menu_File.html -.. _'Edition': Menu_Edition.html -.. _'Simulation': Menu_Simulation.html -.. _'View': Menu_View.html -.. _'Windows': Menu_Windows.html -.. _'Help': Menu_Help.html -.. _'Toolbars': Toolbars.html -.. _'Project' window: Project_window.html -.. _'Properties' window: Properties_window.html -.. _'Console' window: Console_window.html -.. _'Main' window: Main_window.html +.. _'File': menu_file.html +.. _'Edition': menu_edition.html +.. _'Simulation': menu_simulation.html +.. _'View': menu_view.html +.. _'Windows': menu_windows.html +.. _'Help': menu_help.html +.. _'Toolbars': toolbars.html +.. _'Project' window: project_window.html +.. _'Properties' window: properties_window.html +.. _'Console' window: console_window.html +.. _'Main' window: main_window.html diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS.html b/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS.html index 4e999b4c..940be1d3 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS.html @@ -207,7 +207,7 @@SPPS is a sound particles-tracing code, based on geometrical, energetical and probabilistic approaches.
The simulation principle of the SPPS code (from French “Simulation de la Propagation @@ -253,9 +253,9 @@
- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_Validation.html b/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_Validation.html index ce697831..6c5c54a0 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_Validation.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_Validation.html @@ -236,9 +236,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_modelling.html b/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_modelling.html index 6e68c24b..0bb6d44f 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_modelling.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_modelling.html @@ -1025,9 +1025,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_principle.html b/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_principle.html index 966bfe7a..27c74f57 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_principle.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_SPPS_principle.html @@ -281,9 +281,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_TCR.html b/currentRelease/doc/documentation/Offline_documentation/html/code_TCR.html index cb3910f8..2d580281 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_TCR.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_TCR.html @@ -207,7 +207,7 @@TCR is a numerical code based on the Classical Theory or Reverberation.
The simulation code TCR (from French “Théorie Classique de la Réverbération”) is a numerical application of the Classical @@ -236,9 +236,9 @@
- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_characteristics.html b/currentRelease/doc/documentation/Offline_documentation/html/code_characteristics.html index ae47dffa..fc7db6dc 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_characteristics.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_characteristics.html @@ -436,9 +436,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_SPPS.html b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_SPPS.html index 42247f8b..07fb41ba 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_SPPS.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_SPPS.html @@ -788,9 +788,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_TCR.html b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_TCR.html index 5c0c07f9..5dcbfb06 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_TCR.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_TCR.html @@ -322,9 +322,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_frequency_bands.html b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_frequency_bands.html index 38285de8..4f44e0ad 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_frequency_bands.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_frequency_bands.html @@ -271,9 +271,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_job.html b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_job.html index af1d3a07..b4b29fe4 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_job.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_job.html @@ -243,9 +243,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_meshing.html b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_meshing.html index aba983eb..f9045585 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_meshing.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_meshing.html @@ -278,9 +278,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_run.html b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_run.html index c02264dc..6346a86a 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_run.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/code_configuration_run.html @@ -217,9 +217,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/console_window.html b/currentRelease/doc/documentation/Offline_documentation/html/console_window.html index 674d69ad..885ddf19 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/console_window.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/console_window.html @@ -257,9 +257,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/create_charts.html b/currentRelease/doc/documentation/Offline_documentation/html/create_charts.html index 0a39822c..b4a7cbe6 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/create_charts.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/create_charts.html @@ -269,9 +269,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/define_position.html b/currentRelease/doc/documentation/Offline_documentation/html/define_position.html index 9f1580bf..af63acad 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/define_position.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/define_position.html @@ -241,9 +241,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/element_properties_sound_level_results.html b/currentRelease/doc/documentation/Offline_documentation/html/element_properties_sound_level_results.html index 56703ba3..dd1bb5ea 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/element_properties_sound_level_results.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/element_properties_sound_level_results.html @@ -229,9 +229,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/file_csbin.html b/currentRelease/doc/documentation/Offline_documentation/html/file_csbin.html index e6ba7afc..d26eb282 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/file_csbin.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/file_csbin.html @@ -216,9 +216,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/file_gabe.html b/currentRelease/doc/documentation/Offline_documentation/html/file_gabe.html index 2e8bf679..6821619a 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/file_gabe.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/file_gabe.html @@ -216,9 +216,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/file_gap.html b/currentRelease/doc/documentation/Offline_documentation/html/file_gap.html index cab787f0..657e4791 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/file_gap.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/file_gap.html @@ -216,9 +216,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/file_pbin.html b/currentRelease/doc/documentation/Offline_documentation/html/file_pbin.html index 63441645..d3f78cd5 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/file_pbin.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/file_pbin.html @@ -216,9 +216,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/file_recp.html b/currentRelease/doc/documentation/Offline_documentation/html/file_recp.html index fd421d49..e0376a94 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/file_recp.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/file_recp.html @@ -223,9 +223,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/file_recps.html b/currentRelease/doc/documentation/Offline_documentation/html/file_recps.html index 607eca76..89ac5d06 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/file_recps.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/file_recps.html @@ -216,9 +216,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/file_rpi.html b/currentRelease/doc/documentation/Offline_documentation/html/file_rpi.html index 2f07f403..088d7c37 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/file_rpi.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/file_rpi.html @@ -216,9 +216,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/freecad_create_room.html b/currentRelease/doc/documentation/Offline_documentation/html/freecad_create_room.html index a317a55a..0f5405f4 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/freecad_create_room.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/freecad_create_room.html @@ -227,9 +227,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/genindex.html b/currentRelease/doc/documentation/Offline_documentation/html/genindex.html index 57d8580d..b313aec7 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/genindex.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/genindex.html @@ -134,7 +134,6 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Feb 18, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/glossary.html b/currentRelease/doc/documentation/Offline_documentation/html/glossary.html index f684229c..f87c59e8 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/glossary.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/glossary.html @@ -237,9 +237,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/import_file_recommandations.html b/currentRelease/doc/documentation/Offline_documentation/html/import_file_recommandations.html index 389ea319..572447f3 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/import_file_recommandations.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/import_file_recommandations.html @@ -112,8 +112,7 @@It is recommended that users try to export their model in I-Simpa during the different steps of the model building:
Note that, when creating a 3D model for acoustic calculations, it is not necessary to create a very complex 3D model with too many faces. You will have better results with the simple shape of your 3D model, and by adjusting correctly all acoustical characteristics of the material on the face. Make simple.
There is a way inside I-Simpa to identify problems in 3D geometries, after importing the 3D scene.
+There is a way inside I-Simpa to identify problems in 3D geometries, after imprting the 3D scene.
- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Feb 18, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/import_options.html b/currentRelease/doc/documentation/Offline_documentation/html/import_options.html index 73d6e3dc..7c2f4596 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/import_options.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/import_options.html @@ -307,9 +307,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/index.html b/currentRelease/doc/documentation/Offline_documentation/html/index.html index ee193c96..7d785cd5 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/index.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/index.html @@ -134,7 +134,6 @@Note
- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Feb 18, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/main_windows.html b/currentRelease/doc/documentation/Offline_documentation/html/main_windows.html index ddf816aa..8e9d5b2c 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/main_windows.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/main_windows.html @@ -237,9 +237,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/manipulate_sources_receivers.html b/currentRelease/doc/documentation/Offline_documentation/html/manipulate_sources_receivers.html index 901957a4..b86fdee6 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/manipulate_sources_receivers.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/manipulate_sources_receivers.html @@ -282,9 +282,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/menu_edition.html b/currentRelease/doc/documentation/Offline_documentation/html/menu_edition.html index e7ec64f5..4da16437 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/menu_edition.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/menu_edition.html @@ -223,9 +223,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/menu_file.html b/currentRelease/doc/documentation/Offline_documentation/html/menu_file.html index fec53e7a..faec8cd7 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/menu_file.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/menu_file.html @@ -441,9 +441,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/menu_help.html b/currentRelease/doc/documentation/Offline_documentation/html/menu_help.html index f342ef84..2f763318 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/menu_help.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/menu_help.html @@ -203,7 +203,7 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/menu_simulation.html b/currentRelease/doc/documentation/Offline_documentation/html/menu_simulation.html index 57b5417d..0f04329d 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/menu_simulation.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/menu_simulation.html @@ -228,9 +228,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/menu_view.html b/currentRelease/doc/documentation/Offline_documentation/html/menu_view.html index 418606b0..30332896 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/menu_view.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/menu_view.html @@ -296,9 +296,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/menu_windows.html b/currentRelease/doc/documentation/Offline_documentation/html/menu_windows.html index abb0ef48..0e4f51f4 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/menu_windows.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/menu_windows.html @@ -236,9 +236,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/menus.html b/currentRelease/doc/documentation/Offline_documentation/html/menus.html index 4909cc5a..eb9d9199 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/menus.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/menus.html @@ -607,7 +607,7 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/objects.inv b/currentRelease/doc/documentation/Offline_documentation/html/objects.inv index afe0da5d..b9fe75b0 100644 Binary files a/currentRelease/doc/documentation/Offline_documentation/html/objects.inv and b/currentRelease/doc/documentation/Offline_documentation/html/objects.inv differ diff --git a/currentRelease/doc/documentation/Offline_documentation/html/presentation.html b/currentRelease/doc/documentation/Offline_documentation/html/presentation.html index a0273420..f047852a 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/presentation.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/presentation.html @@ -208,14 +208,14 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/project_database.html b/currentRelease/doc/documentation/Offline_documentation/html/project_database.html index 99e4961d..bdc89ac7 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/project_database.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/project_database.html @@ -488,9 +488,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/project_window.html b/currentRelease/doc/documentation/Offline_documentation/html/project_window.html index 5a21290b..02d5dd45 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/project_window.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/project_window.html @@ -2109,9 +2109,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/properties_window.html b/currentRelease/doc/documentation/Offline_documentation/html/properties_window.html index 5228fb34..2d22174c 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/properties_window.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/properties_window.html @@ -233,9 +233,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/references.html b/currentRelease/doc/documentation/Offline_documentation/html/references.html index 5a4219d5..fbcc477c 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/references.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/references.html @@ -351,9 +351,9 @@- © Copyright 2022, Université Gustave Eiffel + © Copyright 2020, Université Gustave Eiffel - Last updated on Jan 12, 2022. + Last updated on Jan 04, 2022.
diff --git a/currentRelease/doc/documentation/Offline_documentation/html/room_acoustics_parameters.html b/currentRelease/doc/documentation/Offline_documentation/html/room_acoustics_parameters.html index 9421bf99..2da4168e 100644 --- a/currentRelease/doc/documentation/Offline_documentation/html/room_acoustics_parameters.html +++ b/currentRelease/doc/documentation/Offline_documentation/html/room_acoustics_parameters.html @@ -135,7 +135,6 @@The Early decay time, noted \(EDT\) (in s), is obtained, like the classical reverberation time, by calculating the slope of the background integration decay curve of the quadratic IR, but this time corresponding to the first 10 decibels of the decay under the stationary state (between \(0\) and \(-10\) dB).
-Table A.1 of the NF EN ISO 3382-1 standard proposes recommended values for most of these acoustic parameters, for concert halls and unoccupied multi-purpose halls up to 25000 m3:
-