IDA test problem requests specific time points.

virtualcell · Jul 28, 2024 · 5af4288 · 5af4288
1 parent 5d1a7fd
commit 5af4288
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 133 deletions.
diff --git a/IDAWin/tests/smoke/SimID_1298727889_0_.ida.expected b/IDAWin/tests/smoke/SimID_1298727889_0_.ida.expected
diff --git a/...ests/smoke/SimID_1298727889_0_.cvodeInput → ...ests/smoke/SimID_1489333437_0_.cvodeInput b/...ests/smoke/SimID_1298727889_0_.cvodeInput → ...ests/smoke/SimID_1489333437_0_.cvodeInput
@@ -4,7 +4,8 @@ ENDING_TIME 1.0
 RELATIVE_TOLERANCE 1.0E-9
 ABSOLUTE_TOLERANCE 1.0E-9
 MAX_TIME_STEP 1.0
-KEEP_EVERY 1
+OUTPUT_TIMES 8
+0.0 1.0E-5 1.0E-4 0.001 0.01 0.1 0.5 1.0
 NUM_EQUATIONS 2
 ODE s2 INIT 4.0;
 	 RATE  - ((2.0 * (-1.0 + (0.5 * s2)) * s2) - (4.0 * (3.5 - (0.5 * s2))));

diff --git a/...tests/smoke/SimID_1298727889_0_.functions → ...tests/smoke/SimID_1489333437_0_.functions b/...tests/smoke/SimID_1298727889_0_.functions → ...tests/smoke/SimID_1489333437_0_.functions
@@ -1,5 +1,5 @@
 ##---------------------------------------------
-##  /Users/jimschaff/.vcell/simdata/temp/SimID_1298727889_0_.functions
+##  /Users/jimschaff/.vcell/simdata/temp/SimID_1489333437_0_.functions
 ##---------------------------------------------
 
 Compartment::J_r0; ((2.0 * (-1.0 + (0.5 * s2)) * s2) - (4.0 * (3.5 - (0.5 * s2)))); ; Nonspatial_VariableType; false

diff --git a/IDAWin/tests/smoke/SimID_1489333437_0_.ida.expected b/IDAWin/tests/smoke/SimID_1489333437_0_.ida.expected
@@ -0,0 +1,9 @@
+t:s2:s4:
+0.00000000000000000E+00	4.00000000000000000E+00	0.00000000000000000E+00
+1.00000000000000008E-05	3.99998000095349759E+00	0.00000000000000000E+00
+1.00000000000000005E-04	3.99980008070643711E+00	0.00000000000000000E+00
+1.00000000000000002E-03	3.99800797408532871E+00	0.00000000000000000E+00
+1.00000000000000002E-02	3.98077784306128457E+00	0.00000000000000000E+00
+1.00000000000000006E-01	3.86170998966032331E+00	0.00000000000000000E+00
+5.00000000000000000E-01	3.74758417187014503E+00	0.00000000000000000E+00
+1.00000000000000000E+00	3.74179783773998942E+00	0.00000000000000000E+00
diff --git a/IDAWin/tests/smoke/SimID_1298727889_0_.log → IDAWin/tests/smoke/SimID_1489333437_0_.log b/IDAWin/tests/smoke/SimID_1298727889_0_.log → IDAWin/tests/smoke/SimID_1489333437_0_.log
@@ -1,4 +1,3 @@
 IDAData logfile
 IDAData text format version 1
-SimID_1298727889_0_.ida
-KeepMost 1000
+SimID_1489333437_0_.ida
diff --git a/...s/smoke/SimID_1298727889_0__0.simtask.xml → ...s/smoke/SimID_1489333437_0__0.simtask.xml b/...s/smoke/SimID_1298727889_0__0.simtask.xml → ...s/smoke/SimID_1489333437_0__0.simtask.xml
@@ -55,11 +55,11 @@
       <TimeBound StartTime="0.0" EndTime="1.0" />
       <TimeStep DefaultTime="0.1" MinTime="1.0E-8" MaxTime="1.0" />
       <ErrorTolerance Absolut="1.0E-9" Relative="1.0E-9" />
-      <OutputOptions KeepEvery="1" KeepAtMost="1000" />
+      <OutputOptions OutputTimes="0.0,1.0E-5,1.0E-4,0.001,0.01,0.1,0.5,1.0" />
       <NumberProcessors>1</NumberProcessors>
     </SolverTaskDescription>
     <MathOverrides />
-    <Version Name="temp simulation" KeyValue="1298727889" BranchId="1" Archived="1" Date="28-Jul-2024 16:41:38" FromVersionable="false">
+    <Version Name="temp simulation" KeyValue="1489333437" BranchId="1" Archived="1" Date="28-Jul-2024 18:28:21" FromVersionable="false">
       <Owner Name="temp" Identifier="123" />
       <GroupAccess Type="1" />
     </Version>

diff --git a/IDAWin/tests/smoke/simpleModel_Network_orig.vcml b/IDAWin/tests/smoke/simpleModel_Network_orig.vcml
@@ -159,11 +159,11 @@
           <TimeBound StartTime="0.0" EndTime="1.0" />
           <TimeStep DefaultTime="0.1" MinTime="1.0E-8" MaxTime="1.0" />
           <ErrorTolerance Absolut="1.0E-9" Relative="1.0E-9" />
-          <OutputOptions KeepEvery="1" KeepAtMost="1000" />
+          <OutputOptions OutputTimes="0.0,1.0E-5,1.0E-4,0.001,0.01,0.1,0.5,1.0" />
           <NumberProcessors>1</NumberProcessors>
         </SolverTaskDescription>
         <MathOverrides />
-        <Version Name="Simulation0" KeyValue="95705119" BranchId="95705120" Archived="0" Date="06-Aug-2015 13:27:30" FromVersionable="false">
+        <Version Name="Simulation0" KeyValue="273319284" BranchId="95705120" Archived="0" Date="28-Jul-2024 22:26:56" FromVersionable="false">
           <Owner Name="schaff" Identifier="17" />
           <GroupAccess Type="1" />
         </Version>
@@ -566,7 +566,7 @@
             <ParticleDriftZ>0.0</ParticleDriftZ>
           </ParticleProperties>
         </CompartmentSubDomain>
-        <Version Name="Application2_generated" KeyValue="273069957" BranchId="95705061" Archived="0" Date="24-Jul-2024 14:17:07" FromVersionable="false">
+        <Version Name="Application2_generated" KeyValue="273319272" BranchId="95705061" Archived="0" Date="28-Jul-2024 22:26:56" FromVersionable="false">
           <Owner Name="schaff" Identifier="17" />
           <GroupAccess Type="1" />
         </Version>
@@ -593,15 +593,15 @@
           <GroupAccess Type="1" />
         </Version>
       </Simulation>
-      <Version Name="nfsim" KeyValue="273069959" BranchId="95705109" Archived="0" Date="24-Jul-2024 14:17:07" FromVersionable="false">
+      <Version Name="nfsim" KeyValue="273319274" BranchId="95705109" Archived="0" Date="28-Jul-2024 22:26:56" FromVersionable="false">
         <Owner Name="schaff" Identifier="17" />
         <GroupAccess Type="1" />
       </Version>
       <MicroscopeMeasurement Name="fluor">
         <ConvolutionKernel Type="ProjectionZKernel" />
       </MicroscopeMeasurement>
     </SimulationSpec>
-    <Version Name="simpleModel_Network_orig" KeyValue="273069969" BranchId="95705129" Archived="0" Date="24-Jul-2024 14:17:07" FromVersionable="false">
+    <Version Name="simpleModel_Network_orig" KeyValue="273319286" BranchId="95705129" Archived="0" Date="28-Jul-2024 22:26:56" FromVersionable="false">
       <Owner Name="schaff" Identifier="17" />
       <GroupAccess Type="1" />
     </Version>

diff --git a/IDAWin/tests/smoke/smoke.sh b/IDAWin/tests/smoke/smoke.sh
@@ -7,9 +7,9 @@ echo "Running SundialsSolverStandalone_x64 solver with smoke.sh $EXE"
 # get the directory of this script
 TEST_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-INPUT="${TEST_DIR}/SimID_1298727889_0_.cvodeInput"
-OUTPUT="${TEST_DIR}/SimID_1298727889_0_.ida"
-EXPECTED_OUTPUT="${TEST_DIR}/SimID_1298727889_0_.ida.expected"
+INPUT="${TEST_DIR}/SimID_1489333437_0_.cvodeInput"
+OUTPUT="${TEST_DIR}/SimID_1489333437_0_.ida"
+EXPECTED_OUTPUT="${TEST_DIR}/SimID_1489333437_0_.ida.expected"
 
 if [ ! -f "$EXE" ]; then
     echo "NFsim executable $EXE not found. Exiting..."