Skip to content

fix field data fvsolver input file generation with null sim key #9

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

Merged
jcschaff merged 2 commits into from
Apr 5, 2025
Merged

fix field data fvsolver input file generation with null sim key #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d1526e
accommodate null sim key for field data sims.
jcschaff Apr 5, 2025
6a993c4
bump version to 0.0.12
jcschaff Apr 5, 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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "libvcell"
version = "0.0.11"
version = "0.0.12"
description = "This is a python package which wraps a subset of VCell Java code as a native python package."
authors = ["Jim Schaff <schaff@uchc.edu>", "Ezequiel Valencia <evalencia@uchc.edu>"]
repository = "https://github.com/virtualcell/libvcell"
Expand Down
6 changes: 3 additions & 3 deletions vcell-native/src/main/java/org/vcell/libvcell/SolverUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -90,9 +89,10 @@ private static FieldDataIdentifierSpec[] getFieldDataIdentifierSpecs(Simulation
//
// First, check if the resampled field data files are already present (e.g. if pyvcell wrote the files directly from image data)
//
ExternalDataIdentifier fakeExtDataId = new ExternalDataIdentifier(sim.getKey(), User.tempUser, name);
KeyValue random_key = new KeyValue("123456789");
ExternalDataIdentifier fakeExtDataId = new ExternalDataIdentifier(random_key, User.tempUser, name);
String fieldDataFileName = SimulationData.createCanonicalResampleFileName(fakeExtDataId, fieldFuncArg);
fieldDataFileName = fieldDataFileName.replace("SimID_" + sim.getKey().toString() + "_0_", "SimID_SIMULATIONKEY_JOBINDEX_");
fieldDataFileName = fieldDataFileName.replace("SimID_" + random_key + "_0_", "SimID_SIMULATIONKEY_JOBINDEX_");
File preexistingFieldDataFile = new File(outputDir, fieldDataFileName);
if (preexistingFieldDataFile.exists()) {
fdiSpecList.add(new FieldDataIdentifierSpec(fieldFuncArg, fakeExtDataId));
Expand Down