| 修訂 | 3faed2ed6d65692f5a95ce1d3c526da2bbc584a2 (tree) |
|---|---|
| 時間 | 2022-06-26 09:50:37 |
| 作者 | Harald Klimach <harald.klimach@dlr....> |
| Commiter | Harald Klimach |
Consider also spongelayer_plane_2d and spongelayer_plane_1d in the evaluation
source/tem_spatial_module.f90 (diff)| @@ -1787,12 +1787,12 @@ | ||
| 1787 | 1787 | case ('random') |
| 1788 | 1788 | res = tem_spatial_random_for(me%random, n) |
| 1789 | 1789 | |
| 1790 | - case( 'spongelayer_plane' ) | |
| 1790 | + case( 'spongelayer_plane', 'spongelayer_plane_2d', 'spongelayer_plane_1d' ) | |
| 1791 | 1791 | res = tem_spongeLayer_plane_for(me%spongePlane, treeids, tree, n) |
| 1792 | 1792 | |
| 1793 | 1793 | case( 'spongelayer_box' ) |
| 1794 | 1794 | res = tem_spongeLayer_box_for(me%spongeBox, treeids, tree, n) |
| 1795 | - | |
| 1795 | + | |
| 1796 | 1796 | case( 'spongelayer_box_2d' ) |
| 1797 | 1797 | res = tem_spongeLayer_box2d_for(me%spongeBox, treeids, tree, n) |
| 1798 | 1798 |
| @@ -1817,7 +1817,7 @@ | ||
| 1817 | 1817 | |
| 1818 | 1818 | case( 'viscous_spongelayer_box' ) |
| 1819 | 1819 | res = tem_viscSpongeLayer_box_for(me%spongeBox, treeids, tree, n) |
| 1820 | - | |
| 1820 | + | |
| 1821 | 1821 | case( 'viscous_spongelayer_box_2d' ) |
| 1822 | 1822 | res = tem_viscSpongeLayer_box2d_for(me%spongeBox, treeids, tree, n) |
| 1823 | 1823 |
| @@ -1881,10 +1881,7 @@ | ||
| 1881 | 1881 | & n = n, & |
| 1882 | 1882 | & ncomp = ncomp ) |
| 1883 | 1883 | |
| 1884 | - case( 'spongelayer', 'spongelayer_2d', 'spongelayer_1d' ) | |
| 1885 | - res = tem_spongelayer_plane_for(me%spongePlane, nComp, treeids, tree, n) | |
| 1886 | - | |
| 1887 | - case( 'spongelayer_plane' ) | |
| 1884 | + case( 'spongelayer_plane', 'spongelayer_plane_2d', 'spongelayer_plane_1d' ) | |
| 1888 | 1885 | res = tem_spongeLayer_plane_for(me%spongePlane, nComp, treeids, tree, n) |
| 1889 | 1886 | |
| 1890 | 1887 | case( 'spongelayer_box' ) |
| @@ -2104,13 +2101,13 @@ | ||
| 2104 | 2101 | res = tem_eval_polygon_material_scal( me = me%polygon_material, & |
| 2105 | 2102 | & coord = coord, & |
| 2106 | 2103 | & n = n ) |
| 2107 | - | |
| 2104 | + | |
| 2108 | 2105 | case('polygon_material_3d') |
| 2109 | 2106 | res = tem_eval_polygon_material_scal_3d( me = me%polygon_material, & |
| 2110 | 2107 | & coord = coord, & |
| 2111 | 2108 | & n = n ) |
| 2112 | 2109 | |
| 2113 | - case( 'spongelayer_plane' ) | |
| 2110 | + case( 'spongelayer_plane', 'spongelayer_plane_2d', 'spongelayer_plane_1d' ) | |
| 2114 | 2111 | res = tem_spongeLayer_plane_for(me%spongePlane, coord, n) |
| 2115 | 2112 | |
| 2116 | 2113 | case( 'spongelayer_box' ) |
| @@ -2185,10 +2182,7 @@ | ||
| 2185 | 2182 | case( 'lua_fun' ) |
| 2186 | 2183 | res = tem_spatial_lua_for(me%lua_fun_ref, me%conf, coord, n, ncomp) |
| 2187 | 2184 | |
| 2188 | - case( 'spongelayer', 'spongelayer_2d', 'spongelayer_1d' ) | |
| 2189 | - res = tem_spongelayer_plane_for(me%spongePlane, nComp, coord, n) | |
| 2190 | - | |
| 2191 | - case( 'spongelayer_plane' ) | |
| 2185 | + case( 'spongelayer_plane', 'spongelayer_plane_2d', 'spongelayer_plane_1d' ) | |
| 2192 | 2186 | res = tem_spongeLayer_plane_for(me%spongePlane, nComp, coord, n) |
| 2193 | 2187 | |
| 2194 | 2188 | case( 'spongeLayer_box' ) |
Fork