From 0d1526ef6b9f6f3679f1f1ab47ef31421ebeaa3f Mon Sep 17 00:00:00 2001 From: jcschaff Date: Fri, 4 Apr 2025 22:58:52 -0400 Subject: [PATCH 1/2] accommodate null sim key for field data sims. --- .../src/main/java/org/vcell/libvcell/SolverUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vcell-native/src/main/java/org/vcell/libvcell/SolverUtils.java b/vcell-native/src/main/java/org/vcell/libvcell/SolverUtils.java index 29579c4..95cf2bb 100644 --- a/vcell-native/src/main/java/org/vcell/libvcell/SolverUtils.java +++ b/vcell-native/src/main/java/org/vcell/libvcell/SolverUtils.java @@ -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; @@ -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)); From 6a993c44e844a2818219c2386542417bc57549e0 Mon Sep 17 00:00:00 2001 From: jcschaff Date: Fri, 4 Apr 2025 22:59:30 -0400 Subject: [PATCH 2/2] bump version to 0.0.12 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c9e0bcc..53ac9c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 ", "Ezequiel Valencia "] repository = "https://github.com/virtualcell/libvcell"