Skip to content

Commit 7a1d00d

Browse files
committed
resampled fdat file for field data should use simID from simulation
1 parent 0e0b273 commit 7a1d00d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

vcell-native/src/main/java/org/vcell/libvcell/solvers/LocalFVSolverStandalone.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public void writeFieldFunctionData(OutputContext outputContext, FieldDataIdentif
169169
for (FieldDataIdentifierSpec fdiSpec: argFieldDataIDSpecs) {
170170
File ext_dataDir = new File(this.parentDir, fdiSpec.getFieldFuncArgs().getFieldName());
171171
if (!uniqueFieldDataIDSpecAndFileH.containsKey(fdiSpec)){
172-
File newResampledFieldDataFile = new File(dataDir, SimulationData.createCanonicalResampleFileName(fdiSpec.getExternalDataIdentifier(), fdiSpec.getFieldFuncArgs()));
172+
File newResampledFieldDataFile = new File(dataDir, SimulationData.createCanonicalResampleFileName(getSimulationJob().getVCDataIdentifier(), fdiSpec.getFieldFuncArgs()));
173173
uniqueFieldDataIDSpecAndFileH.put(fdiSpec,newResampledFieldDataFile);
174174
bFieldDataResample.put(fdiSpec, bResampleFlags[i]);
175175
}

vcell-native/src/test/java/org/vcell/libvcell/EntrypointsTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public void testVcmlToFiniteVolumeInput_field_data() throws SolverException, Exp
6868
assertEquals(0, countFiles(output_dir));
6969
String simulationName = "Simulation0";
7070
vcmlToFiniteVolumeInput(vcmlContent, simulationName, parent_dir, output_dir);
71+
listFilesInDirectory(output_dir);
7172
assertEquals(10, countFiles(ext_data_dir));
7273
assertEquals(6, countFiles(output_dir));
7374
}

0 commit comments

Comments
 (0)