diff --git a/src/shared/particle_dynamics/diffusion_optimization_dynamics/diffusion_splitting_base.h b/src/shared/particle_dynamics/diffusion_optimization_dynamics/diffusion_splitting_base.h index 61c3a9115b..660cde9dd3 100644 --- a/src/shared/particle_dynamics/diffusion_optimization_dynamics/diffusion_splitting_base.h +++ b/src/shared/particle_dynamics/diffusion_optimization_dynamics/diffusion_splitting_base.h @@ -50,17 +50,19 @@ namespace SPH public: size_t phi_; - StdLargeVec splitting_index_; - StdLargeVec &Vol_, &mass_; - StdLargeVec &heat_flux_, &heat_source_; + StdLargeVec& Vol_, & mass_; + StdLargeVec& normal_vector_; + StdLargeVec& variable_; + StdLargeVec& heat_flux_, & heat_source_; + StdLargeVec &splitting_index_; StdLargeVec &species_modified_, &species_recovery_; StdLargeVec ¶meter_recovery_, &eta_regularization_; StdLargeVec &residual_T_local_, &residual_T_global_; StdLargeVec &residual_k_local_, &residual_k_global_; StdLargeVec &variation_local_, &variation_global_; StdLargeVec &residual_after_splitting_; - StdLargeVec &normal_vector_; - StdLargeVec &variable_; + + StdVec all_diffusion_; virtual void interaction(size_t index_i, Real dt = 0.0) = 0; diff --git a/tests/user_examples/test_2d_VP_problem1_same_sink_nonop/VP_problem1_same_sink_nonop.cpp b/tests/user_examples/test_2d_VP_problem1_same_sink_nonop/VP_problem1_same_sink_nonop.cpp index e500d4794d..7b37776154 100644 --- a/tests/user_examples/test_2d_VP_problem1_same_sink_nonop/VP_problem1_same_sink_nonop.cpp +++ b/tests/user_examples/test_2d_VP_problem1_same_sink_nonop/VP_problem1_same_sink_nonop.cpp @@ -231,7 +231,6 @@ int main(int ac, char* av[]) int ite = sph_system.RestartStep(); Real T0 = 10; Real End_Time = T0; - Real Observe_time = 0.01 * End_Time; int restart_output_interval = 1000; Real dt = 0.0; Real current_averaged_temperature = 0.0; @@ -248,7 +247,6 @@ int main(int ac, char* av[]) while (GlobalStaticVariables::physical_time_ < End_Time) { - Real integration_time = 0.0; dt = get_time_step_size.exec(); if (ite % 500 == 0) { diff --git a/tests/user_examples/test_2d_VP_problem1_same_sink_opt/VP_problem1_same_sink_opt.cpp b/tests/user_examples/test_2d_VP_problem1_same_sink_opt/VP_problem1_same_sink_opt.cpp index f981f519c7..6119bf7071 100644 --- a/tests/user_examples/test_2d_VP_problem1_same_sink_opt/VP_problem1_same_sink_opt.cpp +++ b/tests/user_examples/test_2d_VP_problem1_same_sink_opt/VP_problem1_same_sink_opt.cpp @@ -220,7 +220,7 @@ int main() int ite_T_total = 1; /* define the total iteration for temperature splitting. */ int ite_k_total = 1; /* define the total iteration for parameter splitting. */ - int ite_rg_total = 1; /* define the total iteration for parameter regularization. */ + //int ite_rg_total = 1; /* define the total iteration for parameter regularization. */ int ite_loop = 0; /* define loop index for optimization cycle. */ int ite_T_comparison_opt = 0; /* define the real step for splitting temperature by sloving PDE. */ @@ -233,14 +233,14 @@ int main() Real dt = 0.0; /* time step size. */ /* Averaged parameter of the last cycle. */ - Real averaged_residual_T_last_local(10.0); + //Real averaged_residual_T_last_local(10.0); Real averaged_residual_T_last_global(10.0); - Real averaged_residual_k_last_local(10.0); - Real averaged_residual_k_last_global(10.0); - Real averaged_variation_last_local(10.0); + //Real averaged_residual_k_last_local(10.0); + //Real averaged_residual_k_last_global(10.0); + //Real averaged_variation_last_local(10.0); Real averaged_variation_last_global(10.0); Real maximum_residual_T_last_global(10.0); - Real maximum_residual_k_last_global(10.0); + //Real maximum_residual_k_last_global(10.0); Real maximum_variation_last_global(10.0); /* Averaged parameter of the current cycle. */ @@ -255,8 +255,8 @@ int main() Real maximum_variation_current_global(10.0); /* Initial parameter for limitation. */ - Real initial_averaged_residual_T = 0.0; - Real initial_averaged_variation = 0.0; + //Real initial_averaged_residual_T = 0.0; + //Real initial_averaged_variation = 0.0; Real opt_averaged_temperature = 0.0; Real nonopt_averaged_temperature = Infinity; Real averaged_k_parameter = 0.0; @@ -270,9 +270,9 @@ int main() /* Parameters related to parameter convergence. */ Real relative_average_variation_difference = 1.0; - Real relative_maximum_variation_difference = 1.0; - Real last_averaged_variation = 0.0; - Real current_averaged_variation = 0.0; + //Real relative_maximum_variation_difference = 1.0; + //Real last_averaged_variation = 0.0; + //Real current_averaged_variation = 0.0; /* Gradient descent parameter for objective function.*/ Real decay_step_alpha = 1; /* The decay step for learning rate. */ @@ -385,14 +385,12 @@ int main() update_regularization_global_variation.exec(dt_ratio_rg * dt); averaged_variation_current_global = calculate_regularization_global_variation.exec(); - initial_averaged_variation = averaged_variation_current_global; maximum_variation_current_global = calculate_maximum_variation.exec(); maximum_variation_last_global = maximum_variation_current_global; update_temperature_pde_residual.exec(dt); averaged_residual_T_current_global = calculate_temperature_global_residual.exec(); averaged_residual_T_last_global = averaged_residual_T_current_global; - initial_averaged_residual_T = averaged_residual_T_current_global; maximum_residual_T_current_global = calculate_maximum_residual.exec(); maximum_residual_T_last_global = maximum_residual_T_current_global; @@ -549,7 +547,7 @@ int main() relative_temperature_difference = abs(current_averaged_temperature - last_averaged_temperature) / last_averaged_temperature; relative_average_variation_difference = abs(averaged_variation_current_global - averaged_variation_last_global) / abs(averaged_variation_last_global); averaged_variation_last_global = averaged_variation_current_global; - relative_maximum_variation_difference = abs(maximum_variation_current_global - maximum_variation_last_global) / abs(maximum_variation_last_global); + //relative_maximum_variation_difference = abs(maximum_variation_current_global - maximum_variation_last_global) / abs(maximum_variation_last_global); maximum_variation_last_global = maximum_variation_current_global; out_file_eta_regularization << std::fixed << std::setprecision(12) << ite_loop << " " << current_eta_regularization << "\n"; diff --git a/tests/user_examples/test_2d_VP_problem4_heat_flux_nonop/VP_problem4_heat_flux_nonop.cpp b/tests/user_examples/test_2d_VP_problem4_heat_flux_nonop/VP_problem4_heat_flux_nonop.cpp index 648fdee906..5345ced88a 100644 --- a/tests/user_examples/test_2d_VP_problem4_heat_flux_nonop/VP_problem4_heat_flux_nonop.cpp +++ b/tests/user_examples/test_2d_VP_problem4_heat_flux_nonop/VP_problem4_heat_flux_nonop.cpp @@ -259,7 +259,6 @@ int main(int ac, char* av[]) int ite = sph_system.RestartStep(); Real T0 = 10; Real End_Time = T0; - Real Observe_time = 0.01 * End_Time; int restart_output_interval = 1000; Real dt = 0.0; Real current_averaged_temperature = 0.0; @@ -279,7 +278,6 @@ int main(int ac, char* av[]) while (GlobalStaticVariables::physical_time_ < End_Time) { - Real integration_time = 0.0; dt = get_time_step_size.exec(); if (ite % 500 == 0) { diff --git a/tests/user_examples/test_2d_VP_problem4_heat_flux_opt/VP_problem4_heat_flux_opt.cpp b/tests/user_examples/test_2d_VP_problem4_heat_flux_opt/VP_problem4_heat_flux_opt.cpp index 5380c11d54..4e94b9e6a8 100644 --- a/tests/user_examples/test_2d_VP_problem4_heat_flux_opt/VP_problem4_heat_flux_opt.cpp +++ b/tests/user_examples/test_2d_VP_problem4_heat_flux_opt/VP_problem4_heat_flux_opt.cpp @@ -240,7 +240,7 @@ int main() int ite_T_total = 1; /* define the total iteration for temperature splitting. */ int ite_k_total = 1; /* define the total iteration for parameter splitting. */ - int ite_rg_total = 1; /* define the total iteration for parameter regularization. */ + //int ite_rg_total = 1; /* define the total iteration for parameter regularization. */ int ite_loop = 0; /* define loop index for optimization cycle. */ int ite_T_comparison_opt = 0; /* define the real step for splitting temperature by sloving PDE. */ @@ -254,14 +254,14 @@ int main() Real dt = 0.0; /* time step size. */ /* Averaged parameter of the last cycle. */ - Real averaged_residual_T_last_local(10.0); + //Real averaged_residual_T_last_local(10.0); Real averaged_residual_T_last_global(10.0); - Real averaged_residual_k_last_local(10.0); - Real averaged_residual_k_last_global(10.0); - Real averaged_variation_last_local(10.0); + //Real averaged_residual_k_last_local(10.0); + //Real averaged_residual_k_last_global(10.0); + //Real averaged_variation_last_local(10.0); Real averaged_variation_last_global(10.0); Real maximum_residual_T_last_global(10.0); - Real maximum_residual_k_last_global(10.0); + //Real maximum_residual_k_last_global(10.0); Real maximum_variation_last_global(10.0); /* Averaged parameter of the current cycle. */ @@ -276,8 +276,8 @@ int main() Real maximum_variation_current_global(10.0); /* Initial parameter for limitation. */ - Real initial_averaged_residual_T = 0.0; - Real initial_averaged_variation = 0.0; + //Real initial_averaged_residual_T = 0.0; + //Real initial_averaged_variation = 0.0; Real opt_averaged_temperature = 0.0; Real nonopt_averaged_temperature = Infinity; Real boundary_averaged_temperature = 0.0; @@ -292,9 +292,9 @@ int main() /* Parameters related to parameter convergence. */ Real relative_average_variation_difference = 1.0; - Real relative_maximum_variation_difference = 1.0; - Real last_averaged_variation = 0.0; - Real current_averaged_variation = 0.0; + //Real relative_maximum_variation_difference = 1.0; + //Real last_averaged_variation = 0.0; + //Real current_averaged_variation = 0.0; /* Gradient descent parameter for objective function.*/ Real decay_step_alpha = 1; /* The decay step for learning rate. */ @@ -415,14 +415,12 @@ int main() update_regularization_global_variation.exec(dt_ratio_rg * dt); averaged_variation_current_global = calculate_regularization_global_variation.exec(); - initial_averaged_variation = averaged_variation_current_global; maximum_variation_current_global = calculate_maximum_variation.exec(); maximum_variation_last_global = maximum_variation_current_global; update_temperature_pde_residual.exec(dt_ratio_t * dt); averaged_residual_T_current_global = calculate_temperature_global_residual.exec(); averaged_residual_T_last_global = averaged_residual_T_current_global; - initial_averaged_residual_T = averaged_residual_T_current_global; maximum_residual_T_current_global = calculate_maximum_residual.exec(); maximum_residual_T_last_global = maximum_residual_T_current_global; @@ -583,7 +581,7 @@ int main() relative_temperature_difference = abs(current_averaged_temperature - last_averaged_temperature) / last_averaged_temperature; relative_average_variation_difference = abs(averaged_variation_current_global - averaged_variation_last_global) / abs(averaged_variation_last_global); averaged_variation_last_global = averaged_variation_current_global; - relative_maximum_variation_difference = abs(maximum_variation_current_global - maximum_variation_last_global) / abs(maximum_variation_last_global); + //relative_maximum_variation_difference = abs(maximum_variation_current_global - maximum_variation_last_global) / abs(maximum_variation_last_global); maximum_variation_last_global = maximum_variation_current_global; out_file_eta_regularization << std::fixed << std::setprecision(12) << ite_loop << " " << current_eta_regularization << "\n";