Merge pull request #9 from virtualcell/fielddata-no-simkey

fix field data fvsolver input file generation with null sim key

Author: jcschaff

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 <[email protected]>", "Ezequiel Valencia <[email protected]>"]
 repository = "https://github.com/virtualcell/libvcell"

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));