Compare commits

..

8 Commits

Author SHA1 Message Date
Marek Nečada 33d144cf68 Fix missing import in finiterectlat-scatter.py
continuous-integration/drone/push Build was killed Details
2023-12-26 12:35:05 +02:00
Marek Nečada 53764f3dd1 Fix qpms_vswf_set_reindex().
continuous-integration/drone/push Build is passing Details
Stupid typo with possibly serious consequences...
2022-06-23 11:34:15 +03:00
Marek Nečada f9620e1d11 Fix saving lists of arrays with recent versions of numpy 2022-06-22 12:30:02 +03:00
Marek Nečada 5e4f9130fb Disable "hard" examples in CI 2022-06-21 15:13:20 +03:00
Marek Nečada 03e5be17f9 Add bc to CI common prerequisities (required to run examples)
continuous-integration/drone/push Build was killed Details
2022-06-21 09:54:24 +03:00
Marek Nečada 74ce35605b Run some working examples in CI
continuous-integration/drone/push Build is failing Details
2022-06-21 09:41:37 +03:00
Marek Nečada 2a85b16347 sympy fix deprecated cyclic printing init
continuous-integration/drone/push Build is passing Details
2022-06-21 09:35:36 +03:00
Marek Nečada ac0d322246 Initial qpms version metadata in library and output files
continuous-integration/drone/push Build is passing Details
Merge branch 'versioning'
2022-06-21 08:53:18 +03:00
7 changed files with 17 additions and 8 deletions

View File

@ -69,7 +69,15 @@ steps:
- make install - make install
- export LIBRARY_PATH=$HOME/.local/lib - export LIBRARY_PATH=$HOME/.local/lib
- python3 setup.py install --user - python3 setup.py install --user
- cd examples/rectangular/modes - pip3 install --user matplotlib #needed to run the examples
- pip3 install --user matplotlib #needed to run the example
- export LD_LIBRARY_PATH=$HOME/.local/lib - export LD_LIBRARY_PATH=$HOME/.local/lib
- cd examples/rectangular/modes
- ./01a_realfreq_svd.sh - ./01a_realfreq_svd.sh
- cd -
- cd examples/hexagonal/modes
#- ./01a_realfreq_svd.sh
#- ./01_compute_modes.sh
#- ./02b_compute_disp_0M.sh
#- ./02_compute_disp.sh
#- ./02x_compute_disp.sh

View File

@ -1,5 +1,5 @@
FROM alpine:latest AS commondeps FROM alpine:latest AS commondeps
RUN apk update \ RUN apk update \
&& apk add cmake python3-dev py3-pip gcc g++ wget git make libc-dev \ && apk add cmake python3-dev py3-pip gcc g++ wget git make libc-dev bc \
&& adduser -D qpmsbuild && adduser -D qpmsbuild

View File

@ -1,6 +1,6 @@
FROM debian:stable AS commondeps FROM debian:stable AS commondeps
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install --no-install-recommends build-essential cmake python3 python3-pip git wget python3-dev \ && apt-get -y install --no-install-recommends build-essential cmake python3 python3-pip git wget python3-dev bc \
&& apt-get clean \ && apt-get clean \
&& useradd -m qpmsbuild && useradd -m qpmsbuild

View File

@ -254,7 +254,7 @@ outfile = defaultprefix + ".npz" if a.output is None else a.output
np.savez(outfile, meta={**vars(a), 'qpms_version' : qpms.__version__()}, np.savez(outfile, meta={**vars(a), 'qpms_version' : qpms.__version__()},
omega=omega, wavenumber=wavenumber, nelem=nelem, wavevector=np.array(a.wavevector), phases=phases, omega=omega, wavenumber=wavenumber, nelem=nelem, wavevector=np.array(a.wavevector), phases=phases,
positions = ss.positions[:,:2], positions = ss.positions[:,:2],
scattered_ir_packed = scattered_ir, scattered_ir_packed = np.array(scattered_ir, dtype=np.object),
scattered_full = scattered_full, scattered_full = scattered_full,
ir_contained = ir_contained, ir_contained = ir_contained,
t=t, l=l, m=m, t=t, l=l, m=m,

View File

@ -1,8 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from qpms.argproc import ArgParser, annotate_pdf_metadata
import math import math
pi = math.pi pi = math.pi
from qpms.argproc import ArgParser
ap = ArgParser(['rectlattice2d_finite', 'single_particle', 'single_lMax', 'omega_seq_real_ng', 'planewave']) ap = ArgParser(['rectlattice2d_finite', 'single_particle', 'single_lMax', 'omega_seq_real_ng', 'planewave'])

View File

@ -1,5 +1,6 @@
import sympy
from sympy.combinatorics import Permutation, PermutationGroup from sympy.combinatorics import Permutation, PermutationGroup
Permutation.print_cyclic = True sympy.init_printing(perm_cyclic = True)
import cmath import cmath
from cmath import exp, pi from cmath import exp, pi
from math import sqrt from math import sqrt

View File

@ -131,7 +131,7 @@ size_t *qpms_vswf_set_reindex(const qpms_vswf_set_spec_t *small, const qpms_vswf
while(big_pairs[bi].ui < small_pairs[si].ui) while(big_pairs[bi].ui < small_pairs[si].ui)
++bi; ++bi;
if(big_pairs[bi].ui == small_pairs[si].ui) if(big_pairs[bi].ui == small_pairs[si].ui)
r[small_pairs[si].i_orig] = big_pairs[si].i_orig; r[small_pairs[si].i_orig] = big_pairs[bi].i_orig;
else else
r[small_pairs[si].i_orig] = ~(size_t)0; r[small_pairs[si].i_orig] = ~(size_t)0;
} }