Skip to content

Commit

Permalink
Linux g++ has more standard rules.
Browse files Browse the repository at this point in the history
1. the definition of the variable should have the same sequence as its  clarify.
2. unused parameter shouldn't appear in the code, otherwise it will be regarded as the error.
  • Loading branch information
Bo-Zhang1995 committed Sep 4, 2023
1 parent 4a75cea commit 1cd9364
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,19 @@ namespace SPH

public:
size_t phi_;
StdLargeVec<int> splitting_index_;
StdLargeVec<Real> &Vol_, &mass_;
StdLargeVec<Real> &heat_flux_, &heat_source_;
StdLargeVec<Real>& Vol_, & mass_;
StdLargeVec<Vecd>& normal_vector_;
StdLargeVec<VariableType>& variable_;
StdLargeVec<Real>& heat_flux_, & heat_source_;
StdLargeVec<int> &splitting_index_;
StdLargeVec<Real> &species_modified_, &species_recovery_;
StdLargeVec<Real> &parameter_recovery_, &eta_regularization_;
StdLargeVec<Real> &residual_T_local_, &residual_T_global_;
StdLargeVec<Real> &residual_k_local_, &residual_k_global_;
StdLargeVec<Real> &variation_local_, &variation_global_;
StdLargeVec<Real> &residual_after_splitting_;
StdLargeVec<Vecd> &normal_vector_;
StdLargeVec<VariableType> &variable_;


StdVec<BaseDiffusion*> all_diffusion_;

virtual void interaction(size_t index_i, Real dt = 0.0) = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -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. */
Expand All @@ -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;
Expand All @@ -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. */
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -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. */
Expand All @@ -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;
Expand All @@ -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. */
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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";

Expand Down

0 comments on commit 1cd9364

Please sign in to comment.