diff --git a/mayavi/mayavi_amcg/filters/boundary_marker_editor.py b/mayavi/mayavi_amcg/filters/boundary_marker_editor.py index 6d9e8c8159..4da88fb55d 100644 --- a/mayavi/mayavi_amcg/filters/boundary_marker_editor.py +++ b/mayavi/mayavi_amcg/filters/boundary_marker_editor.py @@ -193,9 +193,9 @@ def perform_mask(self): # value is the new cell_id of the corresponding cell in the masked grid self._cell_mappings = list( map( - lambda masked, cell_id: None - if masked - else unmasked_cells_list.insert_next_id(cell_id), + lambda masked, cell_id: ( + None if masked else unmasked_cells_list.insert_next_id(cell_id) + ), in_masked, cell_ids, ) diff --git a/python/fluidity/ocean_biology.py b/python/fluidity/ocean_biology.py index 5f47d4f489..ce3142f4b2 100644 --- a/python/fluidity/ocean_biology.py +++ b/python/fluidity/ocean_biology.py @@ -68,9 +68,7 @@ def pznd(state, parameters): G_P = (g * p_P * P_n**2 * Z_n) / (k**2 + p_P * P_n**2 + p_D * D_n**2) # Zooplankton grazing of detritus. - G_D = (g * (1 - p_P) * D_n**2 * Z_n) / ( - k**2 + p_P * P_n**2 + p_D * D_n**2 - ) + G_D = (g * (1 - p_P) * D_n**2 * Z_n) / (k**2 + p_P * P_n**2 + p_D * D_n**2) # Death rate of phytoplankton. De_P = mu_P * P_n * P_n / (P_n + 0.2) @@ -327,12 +325,7 @@ def six_component(state, parameters): # Chl growth scaling factor # R_P=(theta_m/theta)*J*(Q_N+Q_A)/(alpha*I_n+1e-7) - R_P = ( - (theta_m / theta) - * (Q_N + Q_A) - * v - / (v**2 + alpha**2 * I_n**2) ** 0.5 - ) + R_P = (theta_m / theta) * (Q_N + Q_A) * v / (v**2 + alpha**2 * I_n**2) ** 0.5 # Primary production X_P = J * (Q_N + Q_A) * P_n @@ -350,9 +343,7 @@ def six_component(state, parameters): # G_D = (g * epsilon * (1 - p_P) * D_n**2 * Z_n) / ( # g + epsilon * (p_P * P_n**2 + p_D * D_n**2) # ) - G_D = (g * (1 - p_P) * D_n**2 * Z_n) / ( - epsilon + (p_P * P_n**2 + p_D * D_n**2) - ) + G_D = (g * (1 - p_P) * D_n**2 * Z_n) / (epsilon + (p_P * P_n**2 + p_D * D_n**2)) # Death rate of phytoplankton. # There is an additional linear term because we have a unified model diff --git a/tests/netcdf_read_free_surface/height.py b/tests/netcdf_read_free_surface/height.py index 34a7a6a607..57346afa78 100755 --- a/tests/netcdf_read_free_surface/height.py +++ b/tests/netcdf_read_free_surface/height.py @@ -6,8 +6,6 @@ def function(position): xg = 3.0 * position[0] yg = 3.0 * position[1] h1 = multivariate_normal.pdf([xg, yg], cov=[[1, 0], [0, 1]]) - h2 = multivariate_normal.pdf( - [xg, yg], mean=[1, 1], cov=[[1.5**2, 0], [0, 0.5**2]] - ) + h2 = multivariate_normal.pdf([xg, yg], mean=[1, 1], cov=[[1.5**2, 0], [0, 0.5**2]]) h = 10.0 * (h1 - h2) return h diff --git a/tests/square-convection/checkpoint/change_options b/tests/square-convection/checkpoint/change_options index da5ea5b511..ae228bd484 100755 --- a/tests/square-convection/checkpoint/change_options +++ b/tests/square-convection/checkpoint/change_options @@ -17,9 +17,9 @@ for i in range(len(flml_options) - 1): line = flml_options[i] if "" in line: # Change the simulation name - flml_options[ - i + 1 - ] = 'square-convection-picked-up\n' + flml_options[i + 1] = ( + 'square-convection-picked-up\n' + ) for i in range(len(flml_options)): if "" in flml_options[i]: diff --git a/tests/viscous_fs_simpletopbottom/solution.py b/tests/viscous_fs_simpletopbottom/solution.py index a409793ee0..3e067de78c 100644 --- a/tests/viscous_fs_simpletopbottom/solution.py +++ b/tests/viscous_fs_simpletopbottom/solution.py @@ -43,11 +43,7 @@ def t0_eta(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -61,11 +57,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -97,11 +89,7 @@ def t0_xi(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -115,11 +103,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -175,17 +159,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -273,17 +252,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -385,11 +359,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -420,11 +390,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -482,17 +448,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -522,17 +483,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -666,17 +622,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -797,17 +748,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -937,11 +883,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -972,11 +914,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1040,17 +978,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -1106,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( diff --git a/tests/viscous_fs_simpletopbottom_explicit/solution.py b/tests/viscous_fs_simpletopbottom_explicit/solution.py index a409793ee0..3e067de78c 100644 --- a/tests/viscous_fs_simpletopbottom_explicit/solution.py +++ b/tests/viscous_fs_simpletopbottom_explicit/solution.py @@ -43,11 +43,7 @@ def t0_eta(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -61,11 +57,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -97,11 +89,7 @@ def t0_xi(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -115,11 +103,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -175,17 +159,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -273,17 +252,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -385,11 +359,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -420,11 +390,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -482,17 +448,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -522,17 +483,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -666,17 +622,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -797,17 +748,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -937,11 +883,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -972,11 +914,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1040,17 +978,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -1106,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( diff --git a/tests/viscous_fs_simpletopbottom_explicit_testcv/solution.py b/tests/viscous_fs_simpletopbottom_explicit_testcv/solution.py index a409793ee0..3e067de78c 100644 --- a/tests/viscous_fs_simpletopbottom_explicit_testcv/solution.py +++ b/tests/viscous_fs_simpletopbottom_explicit_testcv/solution.py @@ -43,11 +43,7 @@ def t0_eta(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -61,11 +57,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -97,11 +89,7 @@ def t0_xi(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -115,11 +103,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -175,17 +159,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -273,17 +252,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -385,11 +359,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -420,11 +390,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -482,17 +448,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -522,17 +483,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -666,17 +622,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -797,17 +748,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -937,11 +883,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -972,11 +914,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1040,17 +978,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -1106,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( diff --git a/tests/viscous_fs_simpletopbottom_explicit_varrho/solution.py b/tests/viscous_fs_simpletopbottom_explicit_varrho/solution.py index a409793ee0..3e067de78c 100644 --- a/tests/viscous_fs_simpletopbottom_explicit_varrho/solution.py +++ b/tests/viscous_fs_simpletopbottom_explicit_varrho/solution.py @@ -43,11 +43,7 @@ def t0_eta(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -61,11 +57,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -97,11 +89,7 @@ def t0_xi(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -115,11 +103,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -175,17 +159,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -273,17 +252,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -385,11 +359,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -420,11 +390,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -482,17 +448,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -522,17 +483,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -666,17 +622,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -797,17 +748,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -937,11 +883,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -972,11 +914,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1040,17 +978,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -1106,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( diff --git a/tests/viscous_fs_simpletopbottom_testcv/solution.py b/tests/viscous_fs_simpletopbottom_testcv/solution.py index a409793ee0..3e067de78c 100644 --- a/tests/viscous_fs_simpletopbottom_testcv/solution.py +++ b/tests/viscous_fs_simpletopbottom_testcv/solution.py @@ -43,11 +43,7 @@ def t0_eta(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -61,11 +57,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -97,11 +89,7 @@ def t0_xi(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -115,11 +103,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -175,17 +159,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -273,17 +252,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -385,11 +359,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -420,11 +390,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -482,17 +448,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -522,17 +483,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -666,17 +622,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -797,17 +748,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -937,11 +883,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -972,11 +914,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1040,17 +978,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -1106,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( diff --git a/tests/viscous_fs_simpletopbottom_varrho/solution.py b/tests/viscous_fs_simpletopbottom_varrho/solution.py index a409793ee0..3e067de78c 100644 --- a/tests/viscous_fs_simpletopbottom_varrho/solution.py +++ b/tests/viscous_fs_simpletopbottom_varrho/solution.py @@ -43,11 +43,7 @@ def t0_eta(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -61,11 +57,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -97,11 +89,7 @@ def t0_xi(): - (delta_rho * k**2 * mu + k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu + k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -115,11 +103,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 - 4 * delta_rho * rhog ) @@ -175,17 +159,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -273,17 +252,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -385,11 +359,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -420,11 +390,7 @@ def nond_F(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -482,17 +448,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -522,17 +483,12 @@ def nond_F(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -666,17 +622,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -797,17 +748,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -937,11 +883,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -972,11 +914,7 @@ def nond_G(x, t): + (delta_rho * k - k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 - 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 + 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1040,17 +978,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog + sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( @@ -1106,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 + k**2 * rhog - sqrt( - (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 - 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - + 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k + 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) + ( diff --git a/tests/viscous_fs_zhong_spatial/solution.py b/tests/viscous_fs_zhong_spatial/solution.py index d4ce365d04..ff013cf65e 100644 --- a/tests/viscous_fs_zhong_spatial/solution.py +++ b/tests/viscous_fs_zhong_spatial/solution.py @@ -50,11 +50,7 @@ def t0_eta(): - (delta_rho * k**2 * mu - k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu - k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -68,11 +64,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 + 4 * delta_rho * rhog ) @@ -104,11 +96,7 @@ def t0_xi(): - (delta_rho * k**2 * mu - k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu - k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -122,11 +110,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 + 4 * delta_rho * rhog ) @@ -185,17 +169,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -283,17 +262,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -415,11 +389,7 @@ def nond_F(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -450,11 +420,7 @@ def nond_F(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -512,17 +478,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -552,17 +513,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -707,17 +663,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -838,17 +789,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -998,11 +944,7 @@ def nond_G(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1033,11 +975,7 @@ def nond_G(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1101,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -1167,17 +1100,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( diff --git a/tests/viscous_fs_zhong_spatial_explicit/solution.py b/tests/viscous_fs_zhong_spatial_explicit/solution.py index d4ce365d04..ff013cf65e 100644 --- a/tests/viscous_fs_zhong_spatial_explicit/solution.py +++ b/tests/viscous_fs_zhong_spatial_explicit/solution.py @@ -50,11 +50,7 @@ def t0_eta(): - (delta_rho * k**2 * mu - k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu - k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -68,11 +64,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 + 4 * delta_rho * rhog ) @@ -104,11 +96,7 @@ def t0_xi(): - (delta_rho * k**2 * mu - k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu - k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -122,11 +110,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 + 4 * delta_rho * rhog ) @@ -185,17 +169,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -283,17 +262,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -415,11 +389,7 @@ def nond_F(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -450,11 +420,7 @@ def nond_F(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -512,17 +478,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -552,17 +513,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -707,17 +663,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -838,17 +789,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -998,11 +944,7 @@ def nond_G(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1033,11 +975,7 @@ def nond_G(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1101,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -1167,17 +1100,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( diff --git a/tests/viscous_fs_zhong_spatial_explicit_varrho/solution.py b/tests/viscous_fs_zhong_spatial_explicit_varrho/solution.py index d4ce365d04..ff013cf65e 100644 --- a/tests/viscous_fs_zhong_spatial_explicit_varrho/solution.py +++ b/tests/viscous_fs_zhong_spatial_explicit_varrho/solution.py @@ -50,11 +50,7 @@ def t0_eta(): - (delta_rho * k**2 * mu - k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu - k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -68,11 +64,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 + 4 * delta_rho * rhog ) @@ -104,11 +96,7 @@ def t0_xi(): - (delta_rho * k**2 * mu - k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu - k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -122,11 +110,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 + 4 * delta_rho * rhog ) @@ -185,17 +169,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -283,17 +262,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -415,11 +389,7 @@ def nond_F(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -450,11 +420,7 @@ def nond_F(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -512,17 +478,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -552,17 +513,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -707,17 +663,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -838,17 +789,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -998,11 +944,7 @@ def nond_G(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1033,11 +975,7 @@ def nond_G(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1101,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -1167,17 +1100,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( diff --git a/tests/viscous_fs_zhong_spatial_varrho/solution.py b/tests/viscous_fs_zhong_spatial_varrho/solution.py index d4ce365d04..ff013cf65e 100644 --- a/tests/viscous_fs_zhong_spatial_varrho/solution.py +++ b/tests/viscous_fs_zhong_spatial_varrho/solution.py @@ -50,11 +50,7 @@ def t0_eta(): - (delta_rho * k**2 * mu - k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu - k * mu * rhog) * sinh(D * k) * cosh(D * k) - sqrt( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -68,11 +64,7 @@ def t0_eta(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 + 4 * delta_rho * rhog ) @@ -104,11 +96,7 @@ def t0_xi(): - (delta_rho * k**2 * mu - k**2 * mu * rhog) * D * cosh(D * k) ** 2 - (delta_rho * k * mu - k * mu * rhog) * sinh(D * k) * cosh(D * k) + sqrt( - ( - delta_rho**2 * k**2 - - 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 * cosh(D * k) ** 4 - 2 @@ -122,11 +110,7 @@ def t0_xi(): * sinh(D * k) * cosh(D * k) ** 3 + ( - ( - delta_rho**2 * k**2 - + 2 * delta_rho * k**2 * rhog - + k**2 * rhog**2 - ) + (delta_rho**2 * k**2 + 2 * delta_rho * k**2 * rhog + k**2 * rhog**2) * D**2 + 4 * delta_rho * rhog ) @@ -185,17 +169,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -283,17 +262,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -415,11 +389,7 @@ def nond_F(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -450,11 +420,7 @@ def nond_F(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -512,17 +478,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -552,17 +513,12 @@ def nond_F(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -707,17 +663,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -838,17 +789,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -998,11 +944,7 @@ def nond_G(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 - sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1033,11 +975,7 @@ def nond_G(x, t): + (delta_rho * k + k * rhog) * cosh(k) ** 2 + sqrt( delta_rho**2 * k**2 * sinh(k) ** 4 - - 2 - * delta_rho**2 - * k**2 - * sinh(k) ** 2 - * cosh(k) ** 2 + - 2 * delta_rho**2 * k**2 * sinh(k) ** 2 * cosh(k) ** 2 + delta_rho**2 * k**2 * cosh(k) ** 4 + 2 * delta_rho * k**2 * rhog * sinh(k) ** 4 - 2 * delta_rho * k**2 * rhog * cosh(k) ** 4 @@ -1101,17 +1039,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog + sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - ( @@ -1167,17 +1100,12 @@ def nond_G(x, t): + delta_rho * k**2 - k**2 * rhog - sqrt( - (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) - * sinh(k) ** 4 + (delta_rho**2 + 2 * delta_rho * rhog + rhog**2) * sinh(k) ** 4 + delta_rho**2 * k**2 - 2 * delta_rho * k**2 * rhog + k**2 * rhog**2 + 2 - * ( - delta_rho**2 * k - - 2 * delta_rho * k * rhog - + k * rhog**2 - ) + * (delta_rho**2 * k - 2 * delta_rho * k * rhog + k * rhog**2) * sinh(k) * cosh(k) - (