Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.x acoustic tests #685

Merged
merged 71 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from 69 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
8557d2c
Store receiver position if required in ldenConfig (default false)
nicolas-f Oct 2, 2023
acb3a16
About #598 LDAY_GEOM and other final tables now contains receiver alt…
nicolas-f Oct 2, 2023
ec29b63
fetch srid for geom table
nicolas-f Oct 3, 2023
2159475
Check contouring keeping Z value
nicolas-f Oct 5, 2023
712279e
Fix coodinate dimension when creating iso contour table
nicolas-f Oct 9, 2023
2815071
Change label for legend sorting (qgis and kepler)
nicolas-f Oct 9, 2023
acb0fcb
Exercice: J'ai changé le nom de la classe PropagationProcessPathData.…
MaguetteD Apr 4, 2024
20e4d84
** Refactoring the project by renaming the classes to make them more …
MaguetteD May 24, 2024
3b44295
** Refactoring the project by renaming the classes to make them more …
MaguetteD May 27, 2024
fe6cd92
Large commit including new tests in PathFinder.
MaguetteD Jul 11, 2024
70c0d2e
New version of NoiseModelling, with java doc gh-page.
MaguetteD Jul 30, 2024
e668705
G path calculation bug correction.
MaguetteD Aug 1, 2024
5615b72
G path calculation bug correction.
MaguetteD Aug 7, 2024
f6e0e5f
Version 5.0.0 SNAPSHOT and addition of the finals results table in th…
MaguetteD Sep 19, 2024
0ecd3b6
Version 5.0.0 SNAPSHOT and addition of the finals results table in th…
MaguetteD Sep 19, 2024
009a5ae
Version 5.0.0 SNAPSHOT and addition of the finals results table in th…
MaguetteD Sep 19, 2024
df1c7de
Version 5.0.0 SNAPSHOT and addition of the finals results table in th…
MaguetteD Sep 20, 2024
02fc851
Version 5.0.0 SNAPSHOT: merge Isocontour3D and 5.xAcousticTests.
MaguetteD Sep 20, 2024
b1bb56e
Update AttenuationCnossosTest.java
MaguetteD Oct 9, 2024
0cbb7ba
Update CI.yml
MaguetteD Oct 9, 2024
b01903c
Update AttenuationCnossosTest.java
MaguetteD Oct 9, 2024
c997a5f
Update pom.xml
MaguetteD Oct 9, 2024
dd8a4f9
Update pom.xml
MaguetteD Oct 9, 2024
120f471
Update pom.xml
MaguetteD Oct 9, 2024
142a846
Update pom.xml
MaguetteD Oct 9, 2024
da2aa84
Update pom.xml
MaguetteD Oct 9, 2024
c1948fd
Update pom.xml
MaguetteD Oct 9, 2024
3f6fcf7
Update AttenuationCnossosTest.java
MaguetteD Oct 9, 2024
73d373e
Update AttenuationCnossosTest.java
MaguetteD Oct 9, 2024
ee019cb
Update build.gradle
MaguetteD Oct 9, 2024
958da31
Update conf.py
MaguetteD Oct 9, 2024
744e0aa
Update Noise_level_from_traffic.groovy
MaguetteD Oct 9, 2024
8c1e486
Update Noise_level_from_source.groovy
MaguetteD Oct 9, 2024
b7eba0f
Update TestAcousticTools.groovy
MaguetteD Oct 9, 2024
2c1d174
Update TestNoiseModelling.groovy
MaguetteD Oct 9, 2024
8e66187
Update TestTutorials.groovy
MaguetteD Oct 9, 2024
428a212
Update TestTutorials.groovy
MaguetteD Oct 9, 2024
efb964f
Update TestTutorials.groovy
MaguetteD Oct 9, 2024
8828af3
Update LineSource.java
MaguetteD Oct 10, 2024
db47ab1
Update PolarGraphDirectivity.java
MaguetteD Oct 10, 2024
b165ca1
Update Railway.java
MaguetteD Oct 10, 2024
d9fa5a1
Update RailWayCnossosParameters.java
MaguetteD Oct 10, 2024
56eaaf0
Update RailwayVehicleNMPBParameters.java
MaguetteD Oct 10, 2024
8dc35b8
Update NoiseMapByReceiverMaker.java
MaguetteD Oct 10, 2024
45c8ca4
Update Railway.java
MaguetteD Oct 10, 2024
8ef7536
Update NoiseMapInStack.java
MaguetteD Oct 10, 2024
e04bae7
Update NoiseMapLoader.java
MaguetteD Oct 10, 2024
8e37c8b
Update RailWayLWGeom.java
MaguetteD Oct 10, 2024
7fa55bc
Update IsoSurface.java
MaguetteD Oct 10, 2024
1f55889
Update PathFinder.java
MaguetteD Oct 10, 2024
db4014a
Update PathFinderVisitor.java
MaguetteD Oct 10, 2024
6e82ee8
Update ThreadPool.java
MaguetteD Oct 10, 2024
33bf102
Update LayerTinfour.java
MaguetteD Oct 10, 2024
48ce0f5
Update Triangle.java
MaguetteD Oct 10, 2024
1ef5bd1
Update Path.java
MaguetteD Oct 10, 2024
b0f3e04
Update Triangle.java
MaguetteD Oct 10, 2024
4adefc9
Update PointPath.java
MaguetteD Oct 10, 2024
c6f6580
Update Scene.java
MaguetteD Oct 10, 2024
f24b038
Update SegmentPath.java
MaguetteD Oct 10, 2024
9f42ae1
Update ComplexNumber.java
MaguetteD Oct 10, 2024
d84c423
Update MirrorReflection2D.java
MaguetteD Oct 10, 2024
34fbef0
Delete noisemodelling-pathfinder/src/main/java/org/noise_planet/noise…
MaguetteD Oct 10, 2024
3aa6bda
Update LayerTinfourTest.java
MaguetteD Oct 10, 2024
96030e0
Update AttenuationCnossos.java
MaguetteD Oct 10, 2024
bc29cb7
Update AttenuationCnossosParameters.java
MaguetteD Oct 10, 2024
fe44fe1
Update Main.java
MaguetteD Oct 10, 2024
a54a6e8
Update AttenuationParameters.java
MaguetteD Oct 11, 2024
39b7c6e
Update AttenuationParameters.java
MaguetteD Oct 11, 2024
b4b62e3
Update AttenuationParameters.java
MaguetteD Oct 11, 2024
f12a0b3
Update ThreadPool.java
MaguetteD Oct 11, 2024
5dde7dd
Delete noisemodelling-pathfinder/src/main/java/org/noise_planet/noise…
MaguetteD Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Unzip production artifacts
run: cd wps_scripts && ./gradlew assembleDist && unzip build/distributions/scriptrunner.zip
- name: Archive production artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: NoiseModelling_without_gui.zip
path: wps_scripts/scriptrunner/
path: wps_scripts/scriptrunner/
31 changes: 31 additions & 0 deletions .github/workflows/javaDoc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Generate and Deploy Javadoc

on:
push:
branches:
- 4.XDebugTests

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
cache: maven

- name: Build project and generate Javadoc
run: mvn clean javadoc:aggregate

- name: Deploy Javadoc to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
publish_dir: ./target/site/apidocs
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ nbactions.xml
*.versionsBackup
.attach*
Docs/build
Docs/.build
Docs/venv
profile_*.csv
venv/
2 changes: 1 addition & 1 deletion Docs/Architecture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The documentation below presents the architecture of NoiseModelling with its dif
NoiseModelling is made of 4 main `librairies`_:

* ``noisemodelling-emission`` : to determine the noise emission
* ``noisemodelling-pathfinder`` : to determine the noise path
* ``noisemodelling-pathfinder`` : to determine the noise path
* ``noisemodelling-propagation`` : to calculate the noise propagation
* ``noisemodelling-jdbc`` : to connect NoiseModelling to a database

Expand Down
2 changes: 1 addition & 1 deletion Docs/Get_Started_Dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Get Started

* ``noisemodelling-emission`` : to determine the noise emission
* ``noisemodelling-jdbc`` : to connect NoiseModelling to a database
* ``noisemodelling-pathfinder`` : to determine the noise path
* ``noisemodelling-pathfinder`` : to determine the noise path
* ``noisemodelling-propagation`` : to calculate the noise propagation

#. Enjoy & feel free to contact us!
Expand Down
2 changes: 1 addition & 1 deletion Docs/Input_buildings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Below is an example with a initial geometry (coordinates are exprimed in French

.. _EPSG:2154 : https://epsg.io/2154

Ray path
Ray path
-----------------------

Depending on the building modelisation and the ``Zobject`` you have, the acoustic wave path will differ.
Expand Down
2 changes: 1 addition & 1 deletion Docs/Noise_Map_From_Point_Source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ Use the ``NoiseModelling:Noise_level_from_source`` WPS script. Fill the three fo
* ``Buildings table name`` : ``BUILDINGS``

.. warning::
For this example, since we only added information for noise level during the day (field ``LWD500``), we have to skip the noise level calculation for LDEN, LNIGHT and LEVENING. To do so, check the boxes for ``Do not compute LDEN_GEOM``, ``Do not compute LEVENING_GEOM`` and ``Do not compute LNIGHT_GEOM`` options.
For this example, since we only added information for noise level during the day (field ``LWD500``), we have to skip the noise level calculation for AttenuatedPaths, LNIGHT and LEVENING. To do so, check the boxes for ``Do not compute LDEN_GEOM``, ``Do not compute LEVENING_GEOM`` and ``Do not compute LNIGHT_GEOM`` options.

Once ready, click on ``Run Process`` button.

Expand Down
2 changes: 1 addition & 1 deletion Docs/Numerical_Model.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ User can also add directly its own emission sound power level (LW).

Path finding algorithm
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The path finding algorithm is a rubber-band like algorithm as specified in `CNOSSOS-EU`_.
The path finding algorithm is a rubber-band like algorithm as specified in `CNOSSOS-EU`_.

To optimize the processing time, this algorithm is taking benefit from a R-Tree spatial partioning algorithm.

Expand Down
154 changes: 154 additions & 0 deletions Docs/Rapport.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
Final results
================

.. list-table:: Tests list
:widths: 10 20 20 25 30

* - Test Case
- Without lateral diffraction
- Yes/No
- With lateral diffraction
- Yes/No
- Largest Deviation
- dB / Hz
- Details
* - TC01
- Yes
- Yes
- 0.0 / 2000
- :doc:`Detail <TC01_D>`
* - TC02
- Yes
- Yes
- 0.07 / 1000
- :doc:`Detail <TC02_D>`
* - TC03
- Yes
- Yes
- 0.05 / 500
- :doc:`Detail <TC03_D>`
* - TC04
- Yes
- Yes
- 0.07 / 1000
- :doc:`Detail <TC04_D>`
* - TC05
- Yes
- Yes
- 0.0 / 1000
- :doc:`Detail <TC05_D>`
* - TC06
- Yes
- Yes
- 0.06 / 500
- :doc:`Detail <TC06_D>`
* - TC07
- Yes
- Yes
- 0.02 / 1000
- :doc:`Detail <TC07_D>`
* - TC08
- Yes
- Yes
- 0.02 / 1000
- :doc:`Detail <TC08_D>`
* - TC09
- Yes
- Yes
- 0.0 / 8000
- :doc:`Detail <TC09_D>`
* - TC10
- Yes
- Yes
- 0.0 / 500
- :doc:`Detail <TC10_D>`
* - TC11
- Yes
- Yes
- 0.0 / 4000
- :doc:`Detail <TC11_D>`
* - TC12
- Yes
- Yes
- 0.02 / 250
- :doc:`Detail <TC12_D>`
* - TC13
- Yes
- Yes
- 0.01 / 500
- :doc:`Detail <TC13_D>`
* - TC14
- Yes
- Yes
- 0.05 / 1000
- :doc:`Detail <TC14_D>`
* - TC15
- Yes
- Yes
- 0.0 / 500
- :doc:`Detail <TC15_D>`
* - TC16
- Yes
- Yes
- 0.02 / 63
- :doc:`Detail <TC16_D>`
* - TC17
- Yes
- No
- 0.86 / 500
- :doc:`Detail <TC17_D>`
* - TC18
- No
- No
- 0.45 / 125
- :doc:`Detail <TC18_D>`
* - TC19
- No
- No
- 0.95 / 250
- :doc:`Detail <TC19_D>`
* - TC20
- Yes
- Yes
- 0.0 / 8000
- :doc:`Detail <TC20_D>`
* - TC21
- No
- No
- 1.25 / 63
- :doc:`Detail <TC21_D>`
* - TC22
- No
- No
- 1.01 / 4000
- :doc:`Detail <TC22_D>`
* - TC23
- No
- No
- 2.13 / 4000
- :doc:`Detail <TC23_D>`
* - TC24
- No
- No
- 5.53 / 250
- :doc:`Detail <TC24_D>`
* - TC25
- No
- No
- 6.32 / 250
- :doc:`Detail <TC25_D>`
* - TC26
- No
- No
- 6.83 / 2000
- :doc:`Detail <TC26_D>`
* - TC27
- No
- No
- 5.92 / 500
- :doc:`Detail <TC27_D>`
* - TC28
- No
- No
- 61.99 / 250
- :doc:`Detail <TC28_D>`
48 changes: 48 additions & 0 deletions Docs/TC01_D.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
TC01
================

.. list-table::
:widths: 25 25 25

* - Parameters
- Maximum Difference
- Frequency
* - WH
- 0.0
- 63
* - CfH
- 0.0
- 63
* - AGroundH
- 0.0
- 63
* - WF
- 0.0
- 63
* - CfF
- 0.0
- 63
* - AGroundF
- 0.0
- 63
* - AlphaAtm
- 0.0
- 2000
* - AAtm
- 0.0
- 500
* - ADiv
- 0.0
- 63
* - ABoundaryH
- 0.0
- 63
* - ABoundaryF
- 0.0
- 63
* - LH
- 0.0
- 1000
* - LF
- 0.0
- 500
48 changes: 48 additions & 0 deletions Docs/TC02_D.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
TC02
================

.. list-table::
:widths: 25 25 25

* - Parameters
- Maximum Difference
- Frequency
* - WH
- 0.0
- 4000
* - CfH
- 0.0
- 1000
* - AGroundH
- 0.05
- 1000
* - WF
- 0.0
- 4000
* - CfF
- 0.0
- 1000
* - AGroundF
- 0.06
- 1000
* - AlphaAtm
- 0.0
- 2000
* - AAtm
- 0.0
- 500
* - ADiv
- 0.0
- 63
* - ABoundaryH
- 0.05
- 1000
* - ABoundaryF
- 0.06
- 1000
* - LH
- 0.05
- 1000
* - LF
- 0.07
- 1000
48 changes: 48 additions & 0 deletions Docs/TC03_D.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
TC03
================

.. list-table:: Details of TC03
:widths: 25 25 25

* - Parameters
- Maximum Difference
- Frequency
* - WH
- 0.0
- 8000
* - CfH
- 0.0
- 2000
* - AGroundH
- 0.08
- 1000
* - WF
- 0.0
- 250
* - CfF
- 0.0
- 2000
* - AGroundF
- 0.05
- 500
* - AlphaAtm
- 0.0
- 2000
* - AAtm
- 0.0
- 500
* - ADiv
- 0.0
- 63
* - ABoundaryH
- 0.08
- 1000
* - ABoundaryF
- 0.05
- 500
* - LH
- 0.08
- 1000
* - LF
- 0.05
- 500
Loading
Loading