Merge pull request #417 from mwarusz/shrink_pbl_test

Shrink pbl test

Author: mwarusz

tests/sandbox/pbl/CMakeLists.txt

@@ -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;
 ")
@@ -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;
 ")

tests/sandbox/pbl/budget.py

@@ -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')

tests/sandbox/pbl/pbl_iles.cpp

@@ -9,5 +9,5 @@
 
 int main()
 {
-  test<iles_tag>("out_pbl_iles", 1501);
+  test<iles_tag>("out_pbl_iles", 65, 1501);
 }

tests/sandbox/pbl/pbl_iles_travis.cpp

@@ -9,5 +9,5 @@
 
 int main()
 {
-  test<iles_tag>("out_pbl_iles_travis", 601);
+  test<iles_tag>("out_pbl_iles_travis", 33, 601);
 }

tests/sandbox/pbl/pbl_smg.cpp

@@ -9,5 +9,5 @@
 
 int main()
 {
-  test<smg_tag>("out_pbl_smg", 1501);
+  test<smg_tag>("out_pbl_smg", 65, 1501);
 }

tests/sandbox/pbl/pbl_smg_travis.cpp

@@ -9,5 +9,5 @@
 
 int main()
 {
-  test<smg_tag>("out_pbl_smg_travis", 601);
+  test<smg_tag>("out_pbl_smg_travis", 33, 601);
 }

tests/sandbox/pbl/pbl_test_def.hpp

@@ -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
   {
@@ -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;

tests/sandbox/pbl/profiles.py

@@ -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))