Skip to content

Commit

Permalink
Merge pull request #417 from mwarusz/shrink_pbl_test
Browse files Browse the repository at this point in the history 
Shrink pbl test
  • Loading branch information
@mwarusz
mwarusz committed May 31, 2018
2 parents 48581fc + c374b14 commit b819ea3
Show file tree
Hide file tree
Showing 22 changed files with 49 additions and 47 deletions.
4 changes: 2 additions & 2 deletions tests/sandbox/pbl/CMakeLists.txt
View file
Expand Up @@ -53,7 +53,7 @@ add_test(pbl_iles_travis_diff bash -c "
echo 'comparing timestep0000000000.xmf' &&
diff $dir/timestep0000000000.xmf ${CMAKE_CURRENT_SOURCE_DIR}/refdata/$dir/timestep0000000000.xmf &&
echo 'comparing timestep0000000600.h5' &&
h5diff --delta=1e-6 -v $dir/timestep0000000600.h5 ${CMAKE_CURRENT_SOURCE_DIR}/refdata/$dir/timestep0000000600.h5 &&
h5diff --delta=1e-5 -v $dir/timestep0000000600.h5 ${CMAKE_CURRENT_SOURCE_DIR}/refdata/$dir/timestep0000000600.h5 &&
echo 'comparing timestep0000000600.xmf' &&
diff $dir/timestep0000000600.xmf ${CMAKE_CURRENT_SOURCE_DIR}/refdata/$dir/timestep0000000600.xmf || exit 1;
")
Expand All @@ -69,7 +69,7 @@ add_test(pbl_smg_travis_diff bash -c "
echo 'comparing timestep0000000000.xmf' &&
diff $dir/timestep0000000000.xmf ${CMAKE_CURRENT_SOURCE_DIR}/refdata/$dir/timestep0000000000.xmf &&
echo 'comparing timestep0000000600.h5' &&
h5diff --delta=1e-6 -v $dir/timestep0000000600.h5 ${CMAKE_CURRENT_SOURCE_DIR}/refdata/$dir/timestep0000000600.h5 &&
h5diff --delta=1e-5 -v $dir/timestep0000000600.h5 ${CMAKE_CURRENT_SOURCE_DIR}/refdata/$dir/timestep0000000600.h5 &&
echo 'comparing timestep0000000600.xmf' &&
diff $dir/timestep0000000600.xmf ${CMAKE_CURRENT_SOURCE_DIR}/refdata/$dir/timestep0000000600.xmf || exit 1;
")
2 changes: 1 addition & 1 deletion tests/sandbox/pbl/budget.py
View file
Expand Up @@ -98,7 +98,7 @@
outname = dirname[4:]
outfile = open('budget_' + outname + '.txt', 'w')
for lev_d in zip(Z, hflux, tke_t, dssp, inb):
outfile.write('{:6.2f} {:10.4e} {:10.4e} {:10.4e} {:10.4e}\n'.format(*lev_d))
outfile.write('{:6.2f} {:10.3e} {:10.3e} {:10.3e} {:10.1e}\n'.format(*lev_d))

fig, axarr = plt.subplots(1, 1, figsize= (10, 6))
axarr.plot(hflux, Z, 'k-', lw = 1, label = 'B')
Expand Down
2 changes: 1 addition & 1 deletion tests/sandbox/pbl/pbl_iles.cpp
View file
Expand Up @@ -9,5 +9,5 @@

int main()
{
test<iles_tag>("out_pbl_iles", 1501);
test<iles_tag>("out_pbl_iles", 65, 1501);
}
2 changes: 1 addition & 1 deletion tests/sandbox/pbl/pbl_iles_travis.cpp
View file
Expand Up @@ -9,5 +9,5 @@

int main()
{
test<iles_tag>("out_pbl_iles_travis", 601);
test<iles_tag>("out_pbl_iles_travis", 33, 601);
}
2 changes: 1 addition & 1 deletion tests/sandbox/pbl/pbl_smg.cpp
View file
Expand Up @@ -9,5 +9,5 @@

int main()
{
test<smg_tag>("out_pbl_smg", 1501);
test<smg_tag>("out_pbl_smg", 65, 1501);
}
2 changes: 1 addition & 1 deletion tests/sandbox/pbl/pbl_smg_travis.cpp
View file
Expand Up @@ -9,5 +9,5 @@

int main()
{
test<smg_tag>("out_pbl_smg_travis", 601);
test<smg_tag>("out_pbl_smg_travis", 33, 601);
}
12 changes: 7 additions & 5 deletions tests/sandbox/pbl/pbl_test_def.hpp
View file
Expand Up @@ -35,9 +35,9 @@ void set_sgs_specific(params_t &p, smg_tag)
}

template <typename sgs_t>
void test(const std::string &dirname, const int nt)
void test(const std::string &dirname, const int np, const int nt)
{
const int nx = 65, ny = 65, nz = 51;
const int nx = np, ny = np, nz = 51;

struct ct_params_t : ct_params_default_t
{
Expand All @@ -60,11 +60,13 @@ void test(const std::string &dirname, const int nt)

using solver_t = pbl<ct_params_t>;

const int scale = 64 / (np - 1);

typename solver_t::rt_params_t p;
p.n_iters = 2;
p.dt = 10;
p.di = 50;
p.dj = 50;
p.dt = 10 * scale;
p.di = 50 * scale;
p.dj = 50 * scale;
p.dk = 30;
p.grid_size = {nx, ny, nz};
p.prs_tol = 1e-6;
Expand Down
2 changes: 1 addition & 1 deletion tests/sandbox/pbl/profiles.py
View file
Expand Up @@ -52,7 +52,7 @@
outname = dirname[4:]
outfile = open('profiles_' + outname + '.txt', 'w')
for lev_d in zip(Z, hflux, var_th, var_w):
outfile.write('{:6.2f} {:10.4e} {:10.4e} {:10.4e}\n'.format(*lev_d))
outfile.write('{:6.2f} {:10.3e} {:10.3e} {:10.3e}\n'.format(*lev_d))

# plot profiles
fig, axarr = plt.subplots(1, 3, figsize= (10, 6))
Expand Down
Binary file modified tests/sandbox/pbl/refdata/budget_pbl_iles_travis.txt.gz
View file
Binary file not shown.
Binary file modified tests/sandbox/pbl/refdata/budget_pbl_smg_travis.txt.gz
View file
Binary file not shown.
Binary file modified tests/sandbox/pbl/refdata/out_pbl_iles_travis/const.h5
View file
Binary file not shown.
Binary file modified tests/sandbox/pbl/refdata/out_pbl_iles_travis/timestep0000000000.h5
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions tests/sandbox/pbl/refdata/out_pbl_iles_travis/timestep0000000000.xmf
View file
Expand Up @@ -3,23 +3,23 @@
<Domain>
<Grid Name="Grid" GridType="Uniform" xml:id="gid">
<Time Value="0.000000"/>
<Topology TopologyType="3DSMesh" Dimensions="66 66 52 "/>
<Topology TopologyType="3DSMesh" Dimensions="34 34 52 "/>
<Geometry GeometryType="X_Y_Z">
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/X</DataItem>
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/Y</DataItem>
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/Z</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/X</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/Y</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/Z</DataItem>
</Geometry>
<Attribute Name="tht" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/tht</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/tht</DataItem>
</Attribute>
<Attribute Name="u" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/u</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/u</DataItem>
</Attribute>
<Attribute Name="v" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/v</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/v</DataItem>
</Attribute>
<Attribute Name="w" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/w</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/w</DataItem>
</Attribute>
</Grid>
</Domain>
Expand Down
Binary file modified tests/sandbox/pbl/refdata/out_pbl_iles_travis/timestep0000000600.h5
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions tests/sandbox/pbl/refdata/out_pbl_iles_travis/timestep0000000600.xmf
View file
Expand Up @@ -2,24 +2,24 @@
<Xdmf>
<Domain>
<Grid Name="Grid" GridType="Uniform" xml:id="gid">
<Time Value="6000.000000"/>
<Topology TopologyType="3DSMesh" Dimensions="66 66 52 "/>
<Time Value="12000.000000"/>
<Topology TopologyType="3DSMesh" Dimensions="34 34 52 "/>
<Geometry GeometryType="X_Y_Z">
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/X</DataItem>
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/Y</DataItem>
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/Z</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/X</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/Y</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/Z</DataItem>
</Geometry>
<Attribute Name="tht" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/tht</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/tht</DataItem>
</Attribute>
<Attribute Name="u" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/u</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/u</DataItem>
</Attribute>
<Attribute Name="v" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/v</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/v</DataItem>
</Attribute>
<Attribute Name="w" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/w</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/w</DataItem>
</Attribute>
</Grid>
</Domain>
Expand Down
Binary file modified tests/sandbox/pbl/refdata/out_pbl_smg_travis/const.h5
View file
Binary file not shown.
Binary file modified tests/sandbox/pbl/refdata/out_pbl_smg_travis/timestep0000000000.h5
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions tests/sandbox/pbl/refdata/out_pbl_smg_travis/timestep0000000000.xmf
View file
Expand Up @@ -3,23 +3,23 @@
<Domain>
<Grid Name="Grid" GridType="Uniform" xml:id="gid">
<Time Value="0.000000"/>
<Topology TopologyType="3DSMesh" Dimensions="66 66 52 "/>
<Topology TopologyType="3DSMesh" Dimensions="34 34 52 "/>
<Geometry GeometryType="X_Y_Z">
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/X</DataItem>
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/Y</DataItem>
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/Z</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/X</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/Y</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/Z</DataItem>
</Geometry>
<Attribute Name="tht" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/tht</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/tht</DataItem>
</Attribute>
<Attribute Name="u" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/u</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/u</DataItem>
</Attribute>
<Attribute Name="v" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/v</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/v</DataItem>
</Attribute>
<Attribute Name="w" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/w</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000000.h5:/w</DataItem>
</Attribute>
</Grid>
</Domain>
Expand Down
Binary file modified tests/sandbox/pbl/refdata/out_pbl_smg_travis/timestep0000000600.h5
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions tests/sandbox/pbl/refdata/out_pbl_smg_travis/timestep0000000600.xmf
View file
Expand Up @@ -2,24 +2,24 @@
<Xdmf>
<Domain>
<Grid Name="Grid" GridType="Uniform" xml:id="gid">
<Time Value="6000.000000"/>
<Topology TopologyType="3DSMesh" Dimensions="66 66 52 "/>
<Time Value="12000.000000"/>
<Topology TopologyType="3DSMesh" Dimensions="34 34 52 "/>
<Geometry GeometryType="X_Y_Z">
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/X</DataItem>
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/Y</DataItem>
<DataItem Dimensions="66 66 52 " NumberType="Float" Format="HDF">const.h5:/Z</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/X</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/Y</DataItem>
<DataItem Dimensions="34 34 52 " NumberType="Float" Format="HDF">const.h5:/Z</DataItem>
</Geometry>
<Attribute Name="tht" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/tht</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/tht</DataItem>
</Attribute>
<Attribute Name="u" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/u</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/u</DataItem>
</Attribute>
<Attribute Name="v" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/v</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/v</DataItem>
</Attribute>
<Attribute Name="w" AttributeType="Scalar" Center="Cell">
<DataItem Dimensions="65 65 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/w</DataItem>
<DataItem Dimensions="33 33 51 " NumberType="Float" Format="HDF">timestep0000000600.h5:/w</DataItem>
</Attribute>
</Grid>
</Domain>
Expand Down
Binary file modified tests/sandbox/pbl/refdata/profiles_pbl_iles_travis.txt.gz
View file
Binary file not shown.
Binary file modified tests/sandbox/pbl/refdata/profiles_pbl_smg_travis.txt.gz
View file
Binary file not shown.

0 comments on commit b819ea3

Please sign in to comment.