From ea7966f986b1e71382d002d9f270afa9efb4e647 Mon Sep 17 00:00:00 2001 From: Tobias Hienzsch Date: Wed, 18 Sep 2024 19:30:23 +0200 Subject: [PATCH] Remove pre-build materials --- data/materials/absorber_8000_100mm.h5 | 3 - data/materials/absorber_8000_200mm.h5 | 3 - .../absorber_8000_200mm_gap_100mm.h5 | 3 - .../absorber_8000_200mm_gap_200mm.h5 | 3 - data/materials/absorber_8000_50mm.h5 | 3 - data/materials/concrete_painted.h5 | 3 - data/materials/ctk_acoustic_panel.h5 | 3 - data/materials/ctk_altar.h5 | 3 - data/materials/ctk_audience.h5 | 3 - data/materials/ctk_carpet.h5 | 3 - data/materials/ctk_ceiling.h5 | 3 - data/materials/ctk_chair.h5 | 3 - data/materials/ctk_tile.h5 | 3 - data/materials/ctk_walls.h5 | 3 - data/materials/ctk_window.h5 | 3 - data/materials/door_iron.h5 | 3 - data/materials/door_wood.h5 | 3 - data/materials/floor_wood.h5 | 3 - data/materials/floor_wood_on_concrete.h5 | 3 - data/materials/glas_thick.h5 | 3 - data/materials/leather_arm_chair.h5 | 3 - data/materials/mv_chairs.h5 | 3 - data/materials/mv_floor.h5 | 3 - data/materials/mv_plasterboard.h5 | 3 - data/materials/mv_window.h5 | 3 - data/materials/mv_wood.h5 | 3 - data/materials/sabine_0001.h5 | 3 - data/materials/sabine_001.h5 | 3 - data/materials/sabine_01.h5 | 3 - data/materials/sabine_02.h5 | 3 - data/materials/sabine_03.h5 | 3 - data/materials/sabine_04.h5 | 3 - data/materials/sabine_05.h5 | 3 - data/materials/sabine_1.h5 | 3 - data/materials/sabine_2.h5 | 3 - data/materials/sabine_3.h5 | 3 - data/materials/sabine_4.h5 | 3 - data/materials/sabine_5.h5 | 3 - data/materials/sabine_6.h5 | 3 - data/materials/sabine_7.h5 | 3 - data/materials/sabine_8.h5 | 3 - data/materials/sabine_9.h5 | 3 - data/materials/sabine_9512.h5 | 3 - src/python/pffdtd/materials/build.py | 108 ------------------ src/python/pffdtd/materials/cli.py | 8 +- 45 files changed, 6 insertions(+), 239 deletions(-) delete mode 100644 data/materials/absorber_8000_100mm.h5 delete mode 100644 data/materials/absorber_8000_200mm.h5 delete mode 100644 data/materials/absorber_8000_200mm_gap_100mm.h5 delete mode 100644 data/materials/absorber_8000_200mm_gap_200mm.h5 delete mode 100644 data/materials/absorber_8000_50mm.h5 delete mode 100644 data/materials/concrete_painted.h5 delete mode 100644 data/materials/ctk_acoustic_panel.h5 delete mode 100644 data/materials/ctk_altar.h5 delete mode 100644 data/materials/ctk_audience.h5 delete mode 100644 data/materials/ctk_carpet.h5 delete mode 100644 data/materials/ctk_ceiling.h5 delete mode 100644 data/materials/ctk_chair.h5 delete mode 100644 data/materials/ctk_tile.h5 delete mode 100644 data/materials/ctk_walls.h5 delete mode 100644 data/materials/ctk_window.h5 delete mode 100644 data/materials/door_iron.h5 delete mode 100644 data/materials/door_wood.h5 delete mode 100644 data/materials/floor_wood.h5 delete mode 100644 data/materials/floor_wood_on_concrete.h5 delete mode 100644 data/materials/glas_thick.h5 delete mode 100644 data/materials/leather_arm_chair.h5 delete mode 100644 data/materials/mv_chairs.h5 delete mode 100644 data/materials/mv_floor.h5 delete mode 100644 data/materials/mv_plasterboard.h5 delete mode 100644 data/materials/mv_window.h5 delete mode 100644 data/materials/mv_wood.h5 delete mode 100644 data/materials/sabine_0001.h5 delete mode 100644 data/materials/sabine_001.h5 delete mode 100644 data/materials/sabine_01.h5 delete mode 100644 data/materials/sabine_02.h5 delete mode 100644 data/materials/sabine_03.h5 delete mode 100644 data/materials/sabine_04.h5 delete mode 100644 data/materials/sabine_05.h5 delete mode 100644 data/materials/sabine_1.h5 delete mode 100644 data/materials/sabine_2.h5 delete mode 100644 data/materials/sabine_3.h5 delete mode 100644 data/materials/sabine_4.h5 delete mode 100644 data/materials/sabine_5.h5 delete mode 100644 data/materials/sabine_6.h5 delete mode 100644 data/materials/sabine_7.h5 delete mode 100644 data/materials/sabine_8.h5 delete mode 100644 data/materials/sabine_9.h5 delete mode 100644 data/materials/sabine_9512.h5 delete mode 100644 src/python/pffdtd/materials/build.py diff --git a/data/materials/absorber_8000_100mm.h5 b/data/materials/absorber_8000_100mm.h5 deleted file mode 100644 index fb2097d..0000000 --- a/data/materials/absorber_8000_100mm.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9f2ec7f10415bbb1521594c87f02c5d55a13a6cd48ccca455d70a886caca4ff -size 2312 diff --git a/data/materials/absorber_8000_200mm.h5 b/data/materials/absorber_8000_200mm.h5 deleted file mode 100644 index 3982d69..0000000 --- a/data/materials/absorber_8000_200mm.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9debfc42fae31e886e63a0d7dffab39a4f4c60017f4506c98dede616aa131166 -size 2312 diff --git a/data/materials/absorber_8000_200mm_gap_100mm.h5 b/data/materials/absorber_8000_200mm_gap_100mm.h5 deleted file mode 100644 index efebdb8..0000000 --- a/data/materials/absorber_8000_200mm_gap_100mm.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3baf6a7a0522e902852b28b48c7a5598c44f7aa8742993bfe6db589af7727f24 -size 2312 diff --git a/data/materials/absorber_8000_200mm_gap_200mm.h5 b/data/materials/absorber_8000_200mm_gap_200mm.h5 deleted file mode 100644 index 23e557b..0000000 --- a/data/materials/absorber_8000_200mm_gap_200mm.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f70b21a510232c82e2e530438890cb951ed4a61ff9ece835ca032c2d56551ed2 -size 2312 diff --git a/data/materials/absorber_8000_50mm.h5 b/data/materials/absorber_8000_50mm.h5 deleted file mode 100644 index 37c0631..0000000 --- a/data/materials/absorber_8000_50mm.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb4f384bffb3cd4febaffe34ca3d615af3f1dc12ef23e3bea4549cb797256a9c -size 2312 diff --git a/data/materials/concrete_painted.h5 b/data/materials/concrete_painted.h5 deleted file mode 100644 index 51be299..0000000 --- a/data/materials/concrete_painted.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d2ceb33663a22d6293f1fc4bb8a1730bf4552a5fdfa63ef44b077793d5cbcbf -size 2312 diff --git a/data/materials/ctk_acoustic_panel.h5 b/data/materials/ctk_acoustic_panel.h5 deleted file mode 100644 index daf393e..0000000 --- a/data/materials/ctk_acoustic_panel.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c94a11d7c049e36e62cf7aeb613ffd7a43c3d1d544782912e02b2ac9a8d6196 -size 2312 diff --git a/data/materials/ctk_altar.h5 b/data/materials/ctk_altar.h5 deleted file mode 100644 index 92ad499..0000000 --- a/data/materials/ctk_altar.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85bec6d96db4a1034e28d8aaab562919a9250d3ecab217ab26e5ae37a0d5e63c -size 2312 diff --git a/data/materials/ctk_audience.h5 b/data/materials/ctk_audience.h5 deleted file mode 100644 index ab7e527..0000000 --- a/data/materials/ctk_audience.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4afde1e8a2bf83823bb2ff416ccbb986557b2be6e775571a4df85f6636e9c3c3 -size 2312 diff --git a/data/materials/ctk_carpet.h5 b/data/materials/ctk_carpet.h5 deleted file mode 100644 index 2f1d0ab..0000000 --- a/data/materials/ctk_carpet.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34cd36025bbdf8f16f7dca0f2700f236a10f99f01e3fd4732d5ccc183d8c8149 -size 2312 diff --git a/data/materials/ctk_ceiling.h5 b/data/materials/ctk_ceiling.h5 deleted file mode 100644 index 17eb1a4..0000000 --- a/data/materials/ctk_ceiling.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:245d750b503f3aca2e28651aa64372f727293a4abbd544f999790ca31da80a4f -size 2312 diff --git a/data/materials/ctk_chair.h5 b/data/materials/ctk_chair.h5 deleted file mode 100644 index 6b77370..0000000 --- a/data/materials/ctk_chair.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c75d29b6c6556bce633310e996358f6c27cb7297fe13a06cbb1f63a3bcae0f3 -size 2312 diff --git a/data/materials/ctk_tile.h5 b/data/materials/ctk_tile.h5 deleted file mode 100644 index 82b73aa..0000000 --- a/data/materials/ctk_tile.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1bce775fd81bf1f6cc6430d289e6192b9821ae65f23940b739220a327f562ed -size 2312 diff --git a/data/materials/ctk_walls.h5 b/data/materials/ctk_walls.h5 deleted file mode 100644 index 22d612e..0000000 --- a/data/materials/ctk_walls.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e311e0f933bdaf6097f17387c5c0b0b2b954228075d5e10b5b0a4da578c5e723 -size 2312 diff --git a/data/materials/ctk_window.h5 b/data/materials/ctk_window.h5 deleted file mode 100644 index 19fff6a..0000000 --- a/data/materials/ctk_window.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed7070a7236aecd84f04cb71bc132456ebc049d6b813dc3e3d2a72bf03228037 -size 2312 diff --git a/data/materials/door_iron.h5 b/data/materials/door_iron.h5 deleted file mode 100644 index 397eac8..0000000 --- a/data/materials/door_iron.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f610d7cdc219916634c787d4abeff94a4918377f0e0a5279f1dc627aba2823d9 -size 2312 diff --git a/data/materials/door_wood.h5 b/data/materials/door_wood.h5 deleted file mode 100644 index a29d9e6..0000000 --- a/data/materials/door_wood.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f60b0ad7f9b709ccfbed57b2a390894dfd87e1339ff797785996ec3473cbddb -size 2312 diff --git a/data/materials/floor_wood.h5 b/data/materials/floor_wood.h5 deleted file mode 100644 index 9cf3ab2..0000000 --- a/data/materials/floor_wood.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6879ed917bcc3757f6a154fa0f8bd6b3938ae74b190683278d6d7aa37e342b5 -size 2312 diff --git a/data/materials/floor_wood_on_concrete.h5 b/data/materials/floor_wood_on_concrete.h5 deleted file mode 100644 index 0fb059b..0000000 --- a/data/materials/floor_wood_on_concrete.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24496d184799eb5dc99cd3ce6594e716054f541cd9df65f8a3754b0be94010c7 -size 2312 diff --git a/data/materials/glas_thick.h5 b/data/materials/glas_thick.h5 deleted file mode 100644 index e4bcad9..0000000 --- a/data/materials/glas_thick.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f2b283bdce7d99ee04996df5b276e7124ede64b02c1c4c92b26e10221cb4da6 -size 2312 diff --git a/data/materials/leather_arm_chair.h5 b/data/materials/leather_arm_chair.h5 deleted file mode 100644 index 469e6bc..0000000 --- a/data/materials/leather_arm_chair.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:baf34a034b3d0bc62f664e307356ec1d08504fc07648c2b1fd54d67d1b46d920 -size 2312 diff --git a/data/materials/mv_chairs.h5 b/data/materials/mv_chairs.h5 deleted file mode 100644 index 647aacd..0000000 --- a/data/materials/mv_chairs.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5328c0c7b7b8602e2fdc1908ca7c2db101cabf54131548f900c2320dab99ceb5 -size 2312 diff --git a/data/materials/mv_floor.h5 b/data/materials/mv_floor.h5 deleted file mode 100644 index 3756aef..0000000 --- a/data/materials/mv_floor.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b524c07761c49fd7a2c56cedc7ae95f682a998102bde5de4fd26f6bea80006a -size 2312 diff --git a/data/materials/mv_plasterboard.h5 b/data/materials/mv_plasterboard.h5 deleted file mode 100644 index bf2aa7f..0000000 --- a/data/materials/mv_plasterboard.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa4a603fdf8e0d8861cbad480fb626f9e9e0fad69ee9a331f1cbbcd33bc41c68 -size 2312 diff --git a/data/materials/mv_window.h5 b/data/materials/mv_window.h5 deleted file mode 100644 index 438b0e0..0000000 --- a/data/materials/mv_window.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3166966d92be4e199d864e2e9db199078a200a99a967093d46874e143000de31 -size 2312 diff --git a/data/materials/mv_wood.h5 b/data/materials/mv_wood.h5 deleted file mode 100644 index b2712ec..0000000 --- a/data/materials/mv_wood.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:468f12c91e5a82e3ac5194c6af0a2fee642d68ed99fa2ac760c1ce771075bf7e -size 2312 diff --git a/data/materials/sabine_0001.h5 b/data/materials/sabine_0001.h5 deleted file mode 100644 index 7f46e36..0000000 --- a/data/materials/sabine_0001.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe9545d1ad486c962dc807ddb4c6e0df668b8aec16fd2a9791b845a1c0e9e5f3 -size 2072 diff --git a/data/materials/sabine_001.h5 b/data/materials/sabine_001.h5 deleted file mode 100644 index 588145b..0000000 --- a/data/materials/sabine_001.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db18efba6c91cd11796c7213e360fe3129785f1f9176f86988e7dfd079af07e5 -size 2072 diff --git a/data/materials/sabine_01.h5 b/data/materials/sabine_01.h5 deleted file mode 100644 index a3e56df..0000000 --- a/data/materials/sabine_01.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:490c7a07e06bc1ec9545e0f8ac47e60e00065516a6776e265f5bb3e2ed3850f5 -size 2072 diff --git a/data/materials/sabine_02.h5 b/data/materials/sabine_02.h5 deleted file mode 100644 index 68dcc95..0000000 --- a/data/materials/sabine_02.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2453cdc3bd6455d93da182bb5b5e5de501da90e8cb207ac2c11a94d3c95127f2 -size 2072 diff --git a/data/materials/sabine_03.h5 b/data/materials/sabine_03.h5 deleted file mode 100644 index 9314609..0000000 --- a/data/materials/sabine_03.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4022ba75e7cb9fc0d514365f59c95428e74efdd31e0978be044d42838c9b6618 -size 2072 diff --git a/data/materials/sabine_04.h5 b/data/materials/sabine_04.h5 deleted file mode 100644 index f852e9e..0000000 --- a/data/materials/sabine_04.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2f10df62936b59865d1ab9414c3926f916c4c9f1498394974aef4eb3026cf0d -size 2072 diff --git a/data/materials/sabine_05.h5 b/data/materials/sabine_05.h5 deleted file mode 100644 index 96c68ac..0000000 --- a/data/materials/sabine_05.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84e45380b852bd7153ae39269a589018162e93735face4a6c0a637e19669abd5 -size 2072 diff --git a/data/materials/sabine_1.h5 b/data/materials/sabine_1.h5 deleted file mode 100644 index 0d62cb6..0000000 --- a/data/materials/sabine_1.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26e5275a8d1827360e30e114d14359ff27f0a9879abe88b915d6295aba54037e -size 2072 diff --git a/data/materials/sabine_2.h5 b/data/materials/sabine_2.h5 deleted file mode 100644 index b09fb44..0000000 --- a/data/materials/sabine_2.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:264d4367994babdfd75db26887f88c11bc27ac978399e32bb09f8fc21dec82f6 -size 2072 diff --git a/data/materials/sabine_3.h5 b/data/materials/sabine_3.h5 deleted file mode 100644 index c597514..0000000 --- a/data/materials/sabine_3.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f306dfb6702e7884a42f4cc9d1fbdbab7ea89e2fb91f99c77bb8e61e7a631a6 -size 2072 diff --git a/data/materials/sabine_4.h5 b/data/materials/sabine_4.h5 deleted file mode 100644 index c3b2251..0000000 --- a/data/materials/sabine_4.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea5810d115aa8c1b1d63c05c5af3eddffc55172b95008db03f51b055da151f6 -size 2072 diff --git a/data/materials/sabine_5.h5 b/data/materials/sabine_5.h5 deleted file mode 100644 index 4719856..0000000 --- a/data/materials/sabine_5.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6a65db7e13caee94deac6260b394c1cb30e1ef4ac3fb72150d5bbe7774bdbb0 -size 2072 diff --git a/data/materials/sabine_6.h5 b/data/materials/sabine_6.h5 deleted file mode 100644 index be6c6a1..0000000 --- a/data/materials/sabine_6.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:187096cc98cb8a41d4bcc152dcd0a64167bf1f059c3e5c2ed87a41ad8341c3a2 -size 2072 diff --git a/data/materials/sabine_7.h5 b/data/materials/sabine_7.h5 deleted file mode 100644 index 1fb8883..0000000 --- a/data/materials/sabine_7.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebe3773d6ff58a39346d8a4ef7978aadd9421a8eff05635cbc3161f6fcd43b78 -size 2072 diff --git a/data/materials/sabine_8.h5 b/data/materials/sabine_8.h5 deleted file mode 100644 index 45aa3b4..0000000 --- a/data/materials/sabine_8.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0576d484ddf68cc7bfbb83bb3191e6dca37ab19e9ecd8779896bb4b1ec40bd07 -size 2072 diff --git a/data/materials/sabine_9.h5 b/data/materials/sabine_9.h5 deleted file mode 100644 index 552db82..0000000 --- a/data/materials/sabine_9.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db14220cd55e2555caacd7074ea494ba4353810c46b28b935b6fd412bf2838fa -size 2072 diff --git a/data/materials/sabine_9512.h5 b/data/materials/sabine_9512.h5 deleted file mode 100644 index dab6beb..0000000 --- a/data/materials/sabine_9512.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17703779f5485e6497307f04d67c48db0a8d26a0cd0cbfdb7860e509a738da9c -size 2072 diff --git a/src/python/pffdtd/materials/build.py b/src/python/pffdtd/materials/build.py deleted file mode 100644 index 8f9c58e..0000000 --- a/src/python/pffdtd/materials/build.py +++ /dev/null @@ -1,108 +0,0 @@ -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2021 Brian Hamilton - -import click -import numpy as np -from pathlib import Path - -from pffdtd.materials.adm_funcs import ( - convert_Sabs_to_Yn, - fit_to_Sabs_oct_11, - write_freq_ind_mat_from_Yn, -) - - -@click.command(help='Build materials.') -@click.option('--plot/--no-plot', default=False) -@click.argument('write_folder', nargs=1, type=click.Path(exists=True)) -def build(write_folder, plot): - write_folder = Path(write_folder) - - # autopep8: off - absorber_8000_50mm = np.array([0.01, 0.02, 0.03, 0.05, 0.26, 0.59, 0.88, 0.94, 0.95, 0.93, 0.90]) - absorber_8000_100mm = np.array([0.02, 0.03, 0.05, 0.30, 0.69, 0.92, 0.93, 0.94, 0.95, 0.93, 0.90]) - absorber_8000_200mm = np.array([0.05, 0.10, 0.40, 0.85, 0.89, 0.92, 0.93, 0.94, 0.95, 0.93, 0.90]) - absorber_8000_200mm_gap_100mm = np.array([0.10, 0.23, 0.59, 0.84, 0.91, 0.92, 0.95, 0.95, 0.94, 0.93, 0.90]) - absorber_8000_200mm_gap_200mm = np.array([0.19, 0.38, 0.69, 0.84, 0.88, 0.93, 0.95, 0.95, 0.94, 0.93, 0.90]) - concrete_painted = np.array([0.01, 0.01, 0.01, 0.05, 0.06, 0.07, 0.09, 0.08, 0.08, 0.08, 0.08]) - floor_wood = np.array([0.10, 0.11, 0.13, 0.15, 0.11, 0.10, 0.07, 0.06, 0.07, 0.07, 0.07]) - floor_wood_on_concrete = np.array([0.01, 0.01, 0.01, 0.04, 0.04, 0.07, 0.06, 0.06, 0.07, 0.06, 0.06]) - door_iron = np.array([0.01, 0.01, 0.01, 0.01, 0.01, 0.02, 0.02, 0.03, 0.03, 0.03, 0.02]) - door_wood = np.array([0.06, 0.08, 0.14, 0.14, 0.10, 0.06, 0.08, 0.10, 0.10, 0.10, 0.08]) - glas_thick = np.array([0.15, 0.30, 0.27, 0.18, 0.06, 0.04, 0.03, 0.02, 0.02, 0.02, 0.01]) - leather_arm_chair = np.array([0.04, 0.08, 0.16, 0.20, 0.25, 0.29, 0.31, 0.29, 0.25, 0.22, 0.30]) - - fit_to_Sabs_oct_11(absorber_8000_50mm , filename=Path(write_folder / 'absorber_8000_50mm.h5') , plot=plot) - fit_to_Sabs_oct_11(absorber_8000_100mm , filename=Path(write_folder / 'absorber_8000_100mm.h5') , plot=plot) - fit_to_Sabs_oct_11(absorber_8000_200mm , filename=Path(write_folder / 'absorber_8000_200mm.h5') , plot=plot) - fit_to_Sabs_oct_11(absorber_8000_200mm_gap_100mm , filename=Path(write_folder / 'absorber_8000_200mm_gap_100mm.h5') , plot=plot) - fit_to_Sabs_oct_11(absorber_8000_200mm_gap_200mm , filename=Path(write_folder / 'absorber_8000_200mm_gap_200mm.h5') , plot=plot) - fit_to_Sabs_oct_11(concrete_painted , filename=Path(write_folder / 'concrete_painted.h5') , plot=plot) - fit_to_Sabs_oct_11(door_iron , filename=Path(write_folder / 'door_iron.h5') , plot=plot) - fit_to_Sabs_oct_11(door_wood , filename=Path(write_folder / 'door_wood.h5') , plot=plot) - fit_to_Sabs_oct_11(floor_wood , filename=Path(write_folder / 'floor_wood.h5') , plot=plot) - fit_to_Sabs_oct_11(floor_wood_on_concrete , filename=Path(write_folder / 'floor_wood_on_concrete.h5') , plot=plot) - fit_to_Sabs_oct_11(glas_thick , filename=Path(write_folder / 'glas_thick.h5') , plot=plot) - fit_to_Sabs_oct_11(leather_arm_chair , filename=Path(write_folder / 'leather_arm_chair.h5') , plot=plot) - - #freq-independent impedance from Sabine abs coefficient - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.0001),filename=Path(write_folder / 'sabine_0001.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.001),filename=Path(write_folder / 'sabine_001.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.01),filename=Path(write_folder / 'sabine_01.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.02),filename=Path(write_folder / 'sabine_02.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.03),filename=Path(write_folder / 'sabine_03.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.04),filename=Path(write_folder / 'sabine_04.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.05),filename=Path(write_folder / 'sabine_05.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.1),filename=Path(write_folder / 'sabine_1.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.2),filename=Path(write_folder / 'sabine_2.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.3),filename=Path(write_folder / 'sabine_3.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.4),filename=Path(write_folder / 'sabine_4.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.6),filename=Path(write_folder / 'sabine_6.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.5),filename=Path(write_folder / 'sabine_5.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.7),filename=Path(write_folder / 'sabine_7.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.8),filename=Path(write_folder / 'sabine_8.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.9),filename=Path(write_folder / 'sabine_9.h5')) - write_freq_ind_mat_from_Yn(convert_Sabs_to_Yn(0.9512),filename=Path(write_folder / 'sabine_9512.h5')) - - # #some examples to save admittance/impedance data - # #these are Sabine coefficients, 16Hz to 16kHz centre frequencies - # mv_chairs = npa([0.22 , 0.22 , 0.22 , 0.22 , 0.26 , 0.3 , 0.33 , 0.34 , 0.34 , 0.34 , 0.34]) - # mv_floor = npa([0.14 , 0.14 , 0.14 , 0.14 , 0.1 , 0.06 , 0.08 , 0.1 , 0.1 , 0.1 , 0.1]) - # mv_plasterboard = npa([ 0.15 , 0.15 , 0.15 , 0.15 , 0.1 , 0.06 , 0.04 , 0.04 , 0.05 , 0.05 , 0.05]) - # mv_window = npa([0.35 , 0.35 , 0.35 , 0.35 , 0.25 , 0.18 , 0.12 , 0.07 , 0.04 , 0.04 , 0.04]) - # mv_wood = npa([0.25 , 0.25 , 0.25 , 0.25 , 0.15 , 0.1 , 0.09 , 0.08 , 0.07 , 0.07 , 0.07]) - # fit_to_Sabs_oct_11(mv_chairs , filename=Path(write_folder / 'mv_chairs.h5') , plot=plot) - # fit_to_Sabs_oct_11(mv_floor , filename=Path(write_folder / 'mv_floor.h5') , plot=plot) - # fit_to_Sabs_oct_11(mv_plasterboard , filename=Path(write_folder / 'mv_plasterboard.h5') , plot=plot) - # fit_to_Sabs_oct_11(mv_window , filename=Path(write_folder / 'mv_window.h5') , plot=plot) - # fit_to_Sabs_oct_11(mv_wood , filename=Path(write_folder / 'mv_wood.h5') , plot=plot) - - # #these are Sabine coefficients, 16Hz to 16kHz centre frequencies - # ctk_acoustic_panel = npa([0.2 , 0.2 , 0.42 , 0.89 , 1 , 1 , 1 , 1 , 1 , 1 , 1]) - # ctk_altar = npa([0.25 , 0.25 , 0.25 , 0.25 , 0.15 , 0.1 , 0.09 , 0.08 , 0.07 , 0.07 , 0.07]) - # ctk_audience = npa([0.1 , 0.1 , 0.1 , 0.1 , 0.07 , 0.08 , 0.1 , 0.1 , 0.11 , 0.11 , 0.11]) - # ctk_carpet = npa([0.08 , 0.08 , 0.08 , 0.08 , 0.24 , 0.57 , 0.69 , 0.71 , 0.73 , 0.73 , 0.73]) - # ctk_ceiling = npa([0.19 , 0.19 , 0.19 , 0.19 , 0.06 , 0.05 , 0.08 , 0.07 , 0.05 , 0.05 , 0.05]) - # ctk_chair = npa([0.44 , 0.44 , 0.44 , 0.44 , 0.56 , 0.67 , 0.74 , 0.83 , 0.87 , 0.87 , 0.87]) - # ctk_tile = npa([0.015, 0.015 , 0.015 , 0.015 , 0.015 , 0.005 , 0.005 , 0.005 , 0.005 , 0.005 , 0.005]) - # ctk_walls = npa([0.19 , 0.19 , 0.19 , 0.19 , 0.06 , 0.05 , 0.08 , 0.07 , 0.05 , 0.05 , 0.05]) - # ctk_window = npa([0.35 , 0.35 , 0.35 , 0.35 , 0.25 , 0.18 , 0.12 , 0.07 , 0.04 , 0.04 , 0.04]) - - # fit_to_Sabs_oct_11(ctk_acoustic_panel , filename=Path(write_folder / 'ctk_acoustic_panel.h5') , plot=plot) - # fit_to_Sabs_oct_11(ctk_altar , filename=Path(write_folder / 'ctk_altar.h5') , plot=plot) - # fit_to_Sabs_oct_11(ctk_audience , filename=Path(write_folder / 'ctk_audience.h5') , plot=plot) - # fit_to_Sabs_oct_11(ctk_carpet , filename=Path(write_folder / 'ctk_carpet.h5') , plot=plot) - # fit_to_Sabs_oct_11(ctk_ceiling , filename=Path(write_folder / 'ctk_ceiling.h5') , plot=plot) - # fit_to_Sabs_oct_11(ctk_chair , filename=Path(write_folder / 'ctk_chair.h5') , plot=plot) - # fit_to_Sabs_oct_11(ctk_tile , filename=Path(write_folder / 'ctk_tile.h5') , plot=plot) - # fit_to_Sabs_oct_11(ctk_walls , filename=Path(write_folder / 'ctk_walls.h5') , plot=plot) - # fit_to_Sabs_oct_11(ctk_window , filename=Path(write_folder / 'ctk_window.h5') , plot=plot) - - #freq-independent impedance from reflection coefficients - # write_freq_ind_mat_from_Yn(convert_R_to_Yn(0.90),filename=Path(write_folder / 'R90_mat.h5')) - # write_freq_ind_mat_from_Yn(convert_R_to_Yn(0.5),filename=Path(write_folder / 'R50.h5')) - - # #input DEF values directly - # write_freq_dep_mat(npa([[0,1.0,0],[2,3,4]]),filename=Path(write_folder / 'ex_mat.h5')) - - # autopep8: on diff --git a/src/python/pffdtd/materials/cli.py b/src/python/pffdtd/materials/cli.py index 915ba71..89401ee 100644 --- a/src/python/pffdtd/materials/cli.py +++ b/src/python/pffdtd/materials/cli.py @@ -6,7 +6,6 @@ import pathlib from pffdtd.materials.adm_funcs import plot_DEF_admittance, read_mat_DEF -from pffdtd.materials.build import build @click.group(help='Materials.') @@ -22,4 +21,9 @@ def plot(material_file): plot_DEF_admittance(frequencies, material) -materials.add_command(build) +# freq-independent impedance from reflection coefficients +# write_freq_ind_mat_from_Yn(convert_R_to_Yn(0.90),filename=Path(write_folder / 'R90_mat.h5')) +# write_freq_ind_mat_from_Yn(convert_R_to_Yn(0.5),filename=Path(write_folder / 'R50.h5')) + +# #input DEF values directly +# write_freq_dep_mat(npa([[0,1.0,0],[2,3,4]]),filename=Path(write_folder / 'ex_mat.h5'))