Renamed dox -> dot

This commit is contained in:
jpekkila
2019-08-07 16:08:03 +03:00
parent 4ae92587a3
commit e2f5cced1e
2 changed files with 15 additions and 15 deletions

View File

@@ -235,13 +235,13 @@ helical_forcing(Scalar magnitude, Vector k_force, Vector xx, Vector ff_re, Vecto
Scalar cos_phi = cos(phi); Scalar cos_phi = cos(phi);
Scalar sin_phi = sin(phi); Scalar sin_phi = sin(phi);
Scalar cos_k_dox_x = cos(dot(k_force, xx)); Scalar cos_k_dot_x = cos(dot(k_force, xx));
Scalar sin_k_dox_x = sin(dot(k_force, xx)); Scalar sin_k_dot_x = sin(dot(k_force, xx));
// Phase affect only the x-component // Phase affect only the x-component
//Scalar real_comp = cos_k_dox_x; //Scalar real_comp = cos_k_dot_x;
//Scalar imag_comp = sin_k_dox_x; //Scalar imag_comp = sin_k_dot_x;
Scalar real_comp_phase = cos_k_dox_x*cos_phi - sin_k_dox_x*sin_phi; Scalar real_comp_phase = cos_k_dot_x*cos_phi - sin_k_dot_x*sin_phi;
Scalar imag_comp_phase = cos_k_dox_x*sin_phi + sin_k_dox_x*cos_phi; Scalar imag_comp_phase = cos_k_dot_x*sin_phi + sin_k_dot_x*cos_phi;
Vector force = (Vector){ ff_re.x*real_comp_phase - ff_im.x*imag_comp_phase, Vector force = (Vector){ ff_re.x*real_comp_phase - ff_im.x*imag_comp_phase,

View File

@@ -766,13 +766,13 @@ helical_forcing(ModelScalar magnitude, ModelVector k_force, ModelVector xx, Mode
ModelScalar cos_phi = cosl(phi); ModelScalar cos_phi = cosl(phi);
ModelScalar sin_phi = sinl(phi); ModelScalar sin_phi = sinl(phi);
ModelScalar cos_k_dox_x = cosl(dot(k_force, xx)); ModelScalar cos_k_dot_x = cosl(dot(k_force, xx));
ModelScalar sin_k_dox_x = sinl(dot(k_force, xx)); ModelScalar sin_k_dot_x = sinl(dot(k_force, xx));
// Phase affect only the x-component // Phase affect only the x-component
//Scalar real_comp = cos_k_dox_x; //Scalar real_comp = cos_k_dot_x;
//Scalar imag_comp = sin_k_dox_x; //Scalar imag_comp = sin_k_dot_x;
ModelScalar real_comp_phase = cos_k_dox_x*cos_phi - sin_k_dox_x*sin_phi; ModelScalar real_comp_phase = cos_k_dot_x*cos_phi - sin_k_dot_x*sin_phi;
ModelScalar imag_comp_phase = cos_k_dox_x*sin_phi + sin_k_dox_x*cos_phi; ModelScalar imag_comp_phase = cos_k_dot_x*sin_phi + sin_k_dot_x*cos_phi;
ModelVector force = (ModelVector){ ff_re.x*real_comp_phase - ff_im.x*imag_comp_phase, ModelVector force = (ModelVector){ ff_re.x*real_comp_phase - ff_im.x*imag_comp_phase,