@@ -269,7 +269,7 @@ complex<double> eigenmode_amplitude(void *vedata, const vec &p, component c) {
269269
270270 /* define a macro to give us data(x,y,z) on the grid,
271271 in row-major order (the order used by MPB): */
272- #define D (x, y, z ) (data[(((x)* ny + (y)) * nz + (z)) * 3 ])
272+ #define D (x, y, z ) (data[(((x) * ny + (y)) * nz + (z)) * 3 ])
273273 complex <mpb_real> ret;
274274 ret = (((D (x, y, z) * (1.0 - dx) + D (x2, y, z) * dx) * (1.0 - dy) +
275275 (D (x, y2, z) * (1.0 - dx) + D (x2, y2, z) * dx) * dy) *
@@ -349,8 +349,8 @@ void special_kz_phasefix(eigenmode_data *edata, bool phase_flip) {
349349void *fields::get_eigenmode (double frequency, direction d, const volume where, const volume eig_vol,
350350 int band_num, const vec &_kpoint, bool match_frequency, int parity,
351351 double resolution, double eigensolver_tol, double *kdom,
352- void **user_mdata, diffractedplanewave *dp,
353- bool *cache_dispersive, double *cache_frequency) {
352+ void **user_mdata, diffractedplanewave *dp, bool *cache_dispersive,
353+ double *cache_frequency) {
354354 /* --------------------------------------------------------------*/
355355 /* - part 1: preliminary setup for calling MPB -----------------*/
356356 /* --------------------------------------------------------------*/
@@ -1007,8 +1007,8 @@ void fields::get_eigenmode_coefficients(dft_flux flux, const volume &eig_vol, in
10071007 double *vgrp, kpoint_func user_kpoint_func,
10081008 void *user_kpoint_data, vec *kpoints, vec *kdom_list,
10091009 double *cscale, direction d, diffractedplanewave *dp,
1010- void **eigenmode_cache,
1011- bool *cache_dispersive, double *cache_frequency) {
1010+ void **eigenmode_cache, bool *cache_dispersive,
1011+ double *cache_frequency) {
10121012 adjust_mpb_verbosity amv;
10131013 int num_freqs = flux.freq .size ();
10141014 bool match_frequency = true ;
@@ -1032,10 +1032,9 @@ void fields::get_eigenmode_coefficients(dft_flux flux, const volume &eig_vol, in
10321032 double kdom[3 ];
10331033 if (user_kpoint_func) kpoint = user_kpoint_func (flux.freq [nf], band_num, user_kpoint_data);
10341034 am_now_working_on (MPBTime);
1035- void *mode_data =
1036- get_eigenmode (flux.freq [nf], d, flux.where , eig_vol, band_num, kpoint, match_frequency,
1037- parity, eig_resolution, eigensolver_tol, kdom, (void **)&mdata, dp,
1038- cache_dispersive, cache_frequency);
1035+ void *mode_data = get_eigenmode (flux.freq [nf], d, flux.where , eig_vol, band_num, kpoint,
1036+ match_frequency, parity, eig_resolution, eigensolver_tol,
1037+ kdom, (void **)&mdata, dp, cache_dispersive, cache_frequency);
10391038 finished_working ();
10401039 if (!mode_data) { // mode not found, assume evanescent
10411040 coeffs[2 * nb * num_freqs + 2 * nf] = coeffs[2 * nb * num_freqs + 2 * nf + 1 ] = 0 ;
0 commit comments