8000 Patch 360 by kevinstratford · Pull Request #361 · ludwig-cf/ludwig · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Patch 360 #361

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.

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

Merged
merged 4 commits into from
May 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load fil 8000 es.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@

### Changes

version 0.23.1

- Bug fix: https://github.com/ludwig-cf/ludwig/issues/360
Colloid input from files in pre version 20 formats was incompletely
translated leaving some colloids in an incorrect state in which the
colloid was present but had no boundary conditions. This is fixed.
The utility programs for generating colloid files have been updated
to be consistent with the current format.

version 0.23.0

- Action required. Changes to input file keys related to frequency of i/o.
Expand Down
6 changes: 4 additions & 2 deletions src/colloids.c
8000
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Edinburgh Soft Matter and Statistical Physics Group and
* Edinburgh Parallel Computing Centre
*
* (c) 2010-2024 The University of Edinburgh
* (c) 2010-2025 The University of Edinburgh
*
* Contributing authors:
* Kevin Stratford (kevin@epcc.ed.ac.uk)
Expand Down Expand Up @@ -1558,7 +1558,9 @@
colloids_info_update_lists(info);

colloids_info_local_head(info, &pc);
for (; pc; pc = pc->next) nupdate += colloid_type_check(&pc->s);
for (; pc; pc = pc->nextlocal) {
nupdate += colloid_type_check(&pc->s);

Check warning on line 1562 in src/colloids.c

View check run for this annotation

Codecov / codecov/patch

src/colloids.c#L1561-L1562

Added lines #L1561 - L1562 were not covered by tests
}

return nupdate;
}
Expand Down
5 changes: 4 additions & 1 deletion util/colloid_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ int main(int argc, char ** argv) {
state.r[2] = 1.0; /* Z position */
state.rng = index;

if (binary) {
state.bc = COLLOID_BC_BBL;
state.shape = COLLOID_SHAPE_SPHERE;

if (binary) {
colloid_state_write_binary(state, fp);
}
else {
Expand Down
4 changes: 3 additions & 1 deletion util/colloid_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Edinburgh Parallel Computing Centre
*
* Kevin Stratford (kevin@epcc.ed.ac.uk)
* (c) 2012-2022 The University of Edinburgh
* (c) 2012-2025 The University of Edinburgh
*
*****************************************************************************/

Expand Down Expand Up @@ -153,6 +153,8 @@ int main(int argc, char ** argv) {
state[n].q0 = q0;
state[n].q1 = q1;
state[n].rng = 1 + n;
state[n].bc = COLLOID_BC_BBL;
state[n].shape = COLLOID_SHAPE_SPHERE;
}

if (vf < 0.35) {
Expand Down
2 changes: 1 addition & 1 deletion version.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

#define LUDWIG_MAJOR_VERSION 0
#define LUDWIG_MINOR_VERSION 23
#define LUDWIG_PATCH_VERSION 0
#define LUDWIG_PATCH_VERSION 1

#endif
0