Skip to content

First step at integrating cloud particles #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kiefersv wants to merge 30 commits into
base: dev
Choose a base branch
from
Open

First step at integrating cloud particles #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
91e298f
tests added
Kiefersv Sep 2, 2025
9f87665
add code coverage and pylint check
Kiefersv Sep 2, 2025
789e4e3
updated testing
Kiefersv Sep 2, 2025
05a5870
I cant spell
Kiefersv Sep 2, 2025
1d237d8
updated testing
Kiefersv Sep 2, 2025
b12d6de
updated testing
Kiefersv Sep 2, 2025
0356a20
updated testing
Kiefersv Sep 2, 2025
a48feb2
updated testing
Kiefersv Sep 2, 2025
154ce9e
updated testing
Kiefersv Sep 2, 2025
e10ec94
updated testing
Kiefersv Sep 2, 2025
b46d9b8
added necessary file
Kiefersv Sep 2, 2025
bf7ddf5
expanded testing
Kiefersv Sep 2, 2025
e4a8698
remove plotting from coverage
Kiefersv Sep 2, 2025
fa0fad1
intermediate save
Kiefersv Sep 17, 2025
91da3c4
updateded tests
Kiefersv Sep 17, 2025
214f6bc
added files
Kiefersv Sep 17, 2025
538ebf3
shortend fortran mie test
Kiefersv Sep 17, 2025
ac4b37e
expanded testing
Kiefersv Sep 18, 2025
6176f81
finish adding testing for now
Kiefersv Sep 18, 2025
0addc42
Added physics of mixed clouds, no opacity calculations yet. Testing a…
Kiefersv Sep 20, 2025
c44f191
Clean up
Kiefersv Sep 20, 2025
1a33dff
updates
Kiefersv Nov 12, 2025
bd76f7a
testers added
Kiefersv Nov 12, 2025
c1581e4
save
Kiefersv Nov 14, 2025
fb11f9b
resolved conflicts
Kiefersv Nov 14, 2025
0545f6c
starting to resovle
Kiefersv Nov 14, 2025
54f76d7
merged and corrected
Kiefersv Nov 17, 2025
d696f78
small change to reduce review load
Kiefersv Nov 18, 2025
b35e212
updated testing and corrected exp with freefsed
Kiefersv Nov 24, 2025
dca22dd
updated output
Kiefersv Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# This workflow will perform the python testing

name: CI

on:
push:
branches:
- "*"
pull_request:
branches:
- "*"

jobs:
build:
name: Build (${{ matrix.python-version }} | ${{ matrix.os }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ "ubuntu-latest" ]
python-version: [ "3.11" ]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
shell: bash -l {0}
run: |
python -m pip install --upgrade numpy scipy bokeh pytest-cov matplotlib
python -m pip install --upgrade pandas astropy miepython
python -m pip install -e .
- run: pwd
- name: Run Tests
shell: bash -l {0}
run: |
pytest --cov --cov-report=xml tests/*.py
- name: Upload code coverage to Codecov
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: Kiefersv/Virga
1 change: 1 addition & 0 deletions .github/workflows/pylint.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions .github/workflows/pylint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Pylint

on: [ push ]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.11" ]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pylint
- name: Analysing the code with pylint
run: |
pylint $(git ls-files '*.py') --fail-under=8 --disable=R0912,R0913,R0914,R0915,E0401,E0402,R0801,C0103
1 change: 1 addition & 0 deletions .github/workflows/python.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ignore:
- "virga/justplotit.py"
1,971 changes: 1,971 additions & 0 deletions tests/MnS.mieff
View file
Open in desktop

Large diffs are not rendered by default.

11,401 changes: 11,401 additions & 0 deletions tests/MnS_aggregates_Df_2.000000.mieff
View file
Open in desktop

Large diffs are not rendered by default.

1,971 changes: 1,971 additions & 0 deletions tests/SiO2.mieff
View file
Open in desktop

Large diffs are not rendered by default.

196 changes: 196 additions & 0 deletions tests/SiO2.refrind
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
1 227.531 2.17629E+00 3.20625E-03
2 138.793 2.18266E+00 5.39908E-03
3 97.752 2.19335E+00 8.01556E-03
4 73.692 2.21048E+00 1.13994E-02
5 53.879000000000005 2.24927E+00 1.81255E-02
6 42.212 2.31334E+00 2.91000E-02
7 35.753 2.39852E+00 4.51884E-02
8 29.7 2.60742E+00 9.54667E-02
9 24.839 3.33923E+00 4.42462E-01
10 21.395 1.01621E+00 2.63531E+00
11 19.382 4.52441E-01 8.08478E-01
12 18.18 9.51277E-01 1.67266E-01
13 16.978 1.30503E+00 5.89241E-02
14 15.777000000000001 1.51136E+00 2.61174E-02
15 14.575000000000001 1.66144E+00 1.33780E-02
16 13.588000000000001 1.77143E+00 9.80230E-03
17 12.787000000000003 1.86634E+00 1.05163E-02
18 11.986000000000002 1.98366E+00 1.58988E-02
19 11.292000000000002 2.13104E+00 2.90766E-02
20 10.692 2.34518E+00 6.03323E-02
21 10.091 2.81224E+00 1.81622E-01
22 9.648 3.82973E+00 8.27978E-01
23 9.348000000000003 3.08991E+00 3.78268E+00
24 8.995000000000001 6.31775E-01 2.42923E+00
25 8.673 3.40477E-01 1.52602E+00
26 8.345 2.83846E-01 8.90015E-01
27 8.074 4.01640E-01 4.00679E-01
28 7.904 6.04829E-01 2.09142E-01
29 7.714000000000001 7.89730E-01 1.25868E-01
30 7.498 9.34382E-01 8.31809E-02
31 7.284000000000001 1.03717E+00 6.00936E-02
32 7.094000000000001 1.10742E+00 4.69779E-02
33 6.873 1.17248E+00 3.64918E-02
34 6.664000000000001 1.22229E+00 2.94455E-02
35 6.515 1.25257E+00 2.55530E-02
36 6.297 1.29077E+00 2.10448E-02
37 6.064 1.28811E+00 1.09877E-02
38 5.899000000000001 1.27895E+00 6.29629E-03
39 5.759 1.28831E+00 5.82316E-03
40 5.572 1.30457E+00 5.64524E-03
41 5.3790000000000004 1.31695E+00 5.06126E-03
42 5.265 1.32425E+00 4.71691E-03
43 5.149 1.33188E+00 4.38360E-03
44 5.0 1.34200E+00 3.98000E-03
45 4.882 1.34772E+00 2.00259E-03
46 4.827 1.35044E+00 1.44573E-03
47 4.796 1.35199E+00 1.20120E-03
48 4.75 1.35432E+00 9.10429E-04
49 4.7 1.35687E+00 6.71551E-04
50 4.662 1.35883E+00 5.31726E-04
51 4.605 1.36182E+00 3.73286E-04
52 4.504 1.36687E+00 2.33723E-04
53 4.3950000000000005 1.37193E+00 1.82731E-04
54 4.301 1.37641E+00 1.47056E-04
55 4.202 1.38126E+00 1.16380E-04
56 4.074 1.38637E+00 8.61725E-05
57 3.949 1.39103E+00 6.39095E-05
58 3.849 1.39488E+00 4.99723E-05
59 3.749 1.39802E+00 0.00000E+00
60 3.662 1.40077E+00 0.00000E+00
61 3.5870000000000006 1.40318E+00 0.00000E+00
62 3.5130000000000003 1.40550E+00 0.00000E+00
63 3.438 1.40762E+00 0.00000E+00
64 3.363 1.40978E+00 0.00000E+00
65 3.3080000000000003 1.41139E+00 0.00000E+00
66 3.269 1.41247E+00 0.00000E+00
67 3.231 1.41339E+00 0.00000E+00
68 3.193 1.41412E+00 0.00000E+00
69 3.156 1.41484E+00 0.00000E+00
70 3.118 1.41559E+00 0.00000E+00
71 3.085 1.41625E+00 0.00000E+00
72 3.0550000000000006 1.41686E+00 0.00000E+00
73 3.0140000000000002 1.41770E+00 0.00000E+00
74 2.965 1.41872E+00 0.00000E+00
75 2.909 1.41990E+00 0.00000E+00
76 2.8470000000000004 1.42124E+00 0.00000E+00
77 2.787 1.42257E+00 0.00000E+00
78 2.7300000000000004 1.42386E+00 0.00000E+00
79 2.6760000000000006 1.42511E+00 0.00000E+00
80 2.623 1.42636E+00 0.00000E+00
81 2.5740000000000003 1.42754E+00 0.00000E+00
82 2.527 1.42869E+00 0.00000E+00
83 2.482 1.42981E+00 0.00000E+00
84 2.437 1.43096E+00 0.00000E+00
85 2.394 1.43170E+00 0.00000E+00
86 2.354 1.43241E+00 0.00000E+00
87 2.314 1.43310E+00 0.00000E+00
88 2.2760000000000002 1.43371E+00 0.00000E+00
89 2.24 1.43430E+00 0.00000E+00
90 2.2090000000000005 1.43481E+00 0.00000E+00
91 2.183 1.43524E+00 0.00000E+00
92 2.163 1.43558E+00 0.00000E+00
93 2.148 1.43583E+00 0.00000E+00
94 2.137 1.43600E+00 0.00000E+00
95 2.129 1.43612E+00 0.00000E+00
96 2.114 1.43635E+00 0.00000E+00
97 2.091 1.43670E+00 0.00000E+00
98 2.07 1.43703E+00 0.00000E+00
99 2.05 1.43734E+00 0.00000E+00
100 2.03 1.43763E+00 0.00000E+00
101 2.01 1.43792E+00 0.00000E+00
102 1.9820000000000002 1.43833E+00 0.00000E+00
103 1.947 1.43882E+00 0.00000E+00
104 1.916 1.43924E+00 0.00000E+00
105 1.889 1.43961E+00 0.00000E+00
106 1.863 1.43998E+00 0.00000E+00
107 1.837 1.44035E+00 0.00000E+00
108 1.812 1.44070E+00 0.00000E+00
109 1.788 1.44101E+00 0.00000E+00
110 1.766 1.44130E+00 0.00000E+00
111 1.74 1.44164E+00 0.00000E+00
112 1.713 1.44200E+00 0.00000E+00
113 1.692 1.44227E+00 0.00000E+00
114 1.675 1.44249E+00 0.00000E+00
115 1.66 1.44268E+00 0.00000E+00
116 1.646 1.44284E+00 0.00000E+00
117 1.627 1.44307E+00 0.00000E+00
118 1.6040000000000003 1.44334E+00 0.00000E+00
119 1.5840000000000003 1.44359E+00 0.00000E+00
120 1.5670000000000002 1.44380E+00 0.00000E+00
121 1.552 1.44399E+00 0.00000E+00
122 1.538 1.44416E+00 0.00000E+00
123 1.523 1.44434E+00 0.00000E+00
124 1.506 1.44454E+00 0.00000E+00
125 1.4880000000000002 1.44475E+00 0.00000E+00
126 1.4710000000000003 1.44495E+00 0.00000E+00
127 1.452 1.44517E+00 0.00000E+00
128 1.434 1.44538E+00 0.00000E+00
129 1.416 1.44559E+00 0.00000E+00
130 1.4 1.44578E+00 0.00000E+00
131 1.3860000000000001 1.44594E+00 0.00000E+00
132 1.374 1.44608E+00 0.00000E+00
133 1.3580000000000003 1.44625E+00 0.00000E+00
134 1.339 1.44645E+00 0.00000E+00
135 1.318 1.44668E+00 0.00000E+00
136 1.296 1.44692E+00 0.00000E+00
137 1.276 1.44714E+00 0.00000E+00
138 1.259 1.44733E+00 0.00000E+00
139 1.241 1.44753E+00 0.00000E+00
140 1.224 1.44773E+00 0.00000E+00
141 1.206 1.44794E+00 0.00000E+00
142 1.1890000000000003 1.44814E+00 0.00000E+00
143 1.169 1.44838E+00 0.00000E+00
144 1.148 1.44864E+00 0.00000E+00
145 1.126 1.44891E+00 0.00000E+00
146 1.102 1.44919E+00 0.00000E+00
147 1.08 1.44945E+00 0.00000E+00
148 1.061 1.44967E+00 0.00000E+00
149 1.04 1.44993E+00 0.00000E+00
150 1.016 1.45022E+00 0.00000E+00
151 0.9960000000000001 1.45048E+00 0.00000E+00
152 0.98 1.45068E+00 0.00000E+00
153 0.963 1.45091E+00 0.00000E+00
154 0.9440000000000001 1.45116E+00 0.00000E+00
155 0.9310000000000002 1.45134E+00 0.00000E+00
156 0.9190000000000002 1.45150E+00 0.00000E+00
157 0.904 1.45171E+00 0.00000E+00
158 0.8910000000000001 1.45190E+00 0.00000E+00
159 0.877 1.45211E+00 0.00000E+00
160 0.865 1.45228E+00 0.00000E+00
161 0.852 1.45248E+00 0.00000E+00
162 0.834 1.45279E+00 0.00000E+00
163 0.8220000000000001 1.45299E+00 0.00000E+00
164 0.81 1.45320E+00 0.00000E+00
165 0.7920000000000001 1.45352E+00 0.00000E+00
166 0.777 1.45379E+00 0.00000E+00
167 0.765 1.45402E+00 0.00000E+00
168 0.752 1.45426E+00 0.00000E+00
169 0.7390000000000001 1.45451E+00 0.00000E+00
170 0.729 1.45470E+00 0.00000E+00
171 0.714 1.45500E+00 0.00000E+00
172 0.697 1.45537E+00 0.00000E+00
173 0.677 1.45585E+00 0.00000E+00
174 0.6570000000000001 1.45635E+00 0.00000E+00
175 0.642 1.45677E+00 0.00000E+00
176 0.6280000000000001 1.45719E+00 0.00000E+00
177 0.6170000000000001 1.45753E+00 0.00000E+00
178 0.604 1.45794E+00 0.00000E+00
179 0.591 1.45835E+00 0.00000E+00
180 0.578 1.45881E+00 0.00000E+00
181 0.565 1.45932E+00 0.00000E+00
182 0.552 1.45984E+00 0.00000E+00
183 0.537 1.46050E+00 0.00000E+00
184 0.523 1.46117E+00 0.00000E+00
185 0.506 1.46201E+00 0.00000E+00
186 0.485 1.46320E+00 0.00000E+00
187 0.4650000000000001 1.46449E+00 0.00000E+00
188 0.44500000000000006 1.46598E+00 0.00000E+00
189 0.426 1.46759E+00 0.00000E+00
190 0.40800000000000003 1.46929E+00 0.00000E+00
191 0.38700000000000007 1.47174E+00 0.00000E+00
192 0.362 1.47498E+00 0.00000E+00
193 0.3370000000000001 1.47922E+00 0.00000E+00
194 0.312 1.48478E+00 0.00000E+00
195 0.287 1.49178E+00 0.00000E+00
196 0.268 1.49885E+00 0.00000E+00
34 changes: 0 additions & 34 deletions tests/test_cloud.py
View file
Open in desktop

This file was deleted.

Loading