Skip to content

Commit 243fbf2

Browse files
CodeByDrescherCodeByDrescher
committed
added cvodes family of solvers
1 parent a6972c9 commit 243fbf2

4 files changed

Lines changed: 84 additions & 4 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@ docker/swarm/zeke_env.txt
235235
webapp-ng/.nx/
236236

237237
localsolvers/mac64/GNUSparseFile.0/
238+
localsolvers/*/*/*.tgz
239+
localsolvers/*/*/*.zip
240+
localsolvers/*/*/*.tar.gz
238241

239242
webapp-ng/.nvmrc
240243

‎pom.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,18 @@
195195
<solvers-other-mac.version>v0.0.44-dev4</solvers-other-mac.version>
196196
<solvers-other-windows.version>v0.0.40</solvers-other-windows.version>
197197
<solvers-other-linux.version>v0.0.44-dev4</solvers-other-linux.version>
198-
<solvers-fvsolver-mac.version>0.10.4</solvers-fvsolver-mac.version>
199-
<solvers-fvsolver-windows.version>0.10.4</solvers-fvsolver-windows.version>
200-
<solvers-fvsolver-linux.version>0.10.4</solvers-fvsolver-linux.version>
198+
<solvers-fvsolver-mac.version>0.10.5</solvers-fvsolver-mac.version>
199+
<solvers-fvsolver-windows.version>0.10.5</solvers-fvsolver-windows.version>
200+
<solvers-fvsolver-linux.version>0.10.5</solvers-fvsolver-linux.version>
201+
<solvers-cvodes-mac.version>0.9.4</solvers-cvodes-mac.version>
202+
<solvers-cvodes-windows.version>0.9.4</solvers-cvodes-windows.version>
203+
<solvers-cvodes-linux.version>0.9.4</solvers-cvodes-linux.version>
201204
<solvers-langevin-mac.version>1.4.7</solvers-langevin-mac.version>
202205
<solvers-langevin-windows.version>1.4.7</solvers-langevin-windows.version>
203206
<solvers-langevin-linux.version>1.4.7</solvers-langevin-linux.version>
204207
<solvers-other-subdirectory.name>other</solvers-other-subdirectory.name>
205208
<solvers-fvsolver-subdirectory.name>fvsolver</solvers-fvsolver-subdirectory.name>
209+
<solvers-cvodes-subdirectory.name>cvodes</solvers-cvodes-subdirectory.name>
206210
<solvers-langevin-subdirectory.name>langevin</solvers-langevin-subdirectory.name>
207211
</properties>
208212

‎vcell-core/pom.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,42 @@
845845
<outputDirectory>${project.build.directory}/../../localsolvers/mac64/${solvers-fvsolver-subdirectory.name}</outputDirectory>
846846
</configuration>
847847
</execution>
848+
<execution>
849+
<id>download-cvodes-solver-linux64</id>
850+
<phase>generate-test-resources</phase>
851+
<goals>
852+
<goal>wget</goal>
853+
</goals>
854+
<configuration>
855+
<url>https://github.com/virtualcell/vcell-ode/releases/download/${solvers-cvodes-linux.version}/linux64.tgz</url>
856+
<outputDirectory>${project.build.directory}/../../localsolvers/linux64/${solvers-cvodes-subdirectory.name}</outputDirectory>
857+
</configuration>
858+
</execution>
859+
<execution>
860+
<id>install-cvodes-solver-win64</id>
861+
<phase>generate-test-resources</phase>
862+
<goals>
863+
<goal>wget</goal>
864+
</goals>
865+
<configuration>
866+
<url>https://github.com/virtualcell/vcell-ode/releases/download/${solvers-cvodes-windows.version}/win64.zip</url>
867+
<unpack>true</unpack>
868+
<outputDirectory>${project.build.directory}/../../localsolvers/win64/${solvers-cvodes-subdirectory.name}</outputDirectory>
869+
<skipCache>true</skipCache>
870+
</configuration>
871+
</execution>
872+
<execution>
873+
<id>install-cvodes-solver-mac64</id>
874+
<phase>generate-test-resources</phase>
875+
<goals>
876+
<goal>wget</goal>
877+
</goals>
878+
<configuration>
879+
<url>https://github.com/virtualcell/vcell-ode/releases/download/${solvers-cvodes-mac.version}/mac64.tgz</url>
880+
<unpack>true</unpack>
881+
<outputDirectory>${project.build.directory}/../../localsolvers/mac64/${solvers-cvodes-subdirectory.name}</outputDirectory>
882+
</configuration>
883+
</execution>
848884
<execution>
849885
<id>install-langevin-win64</id>
850886
<phase>generate-test-resources</phase>
@@ -1048,6 +1084,42 @@
10481084
<outputDirectory>${project.build.directory}/../../localsolvers/mac64/${solvers-fvsolver-subdirectory.name}</outputDirectory>
10491085
</configuration>
10501086
</execution>
1087+
<execution>
1088+
<id>download-cvodes-solver-linux64</id>
1089+
<phase>generate-test-resources</phase>
1090+
<goals>
1091+
<goal>wget</goal>
1092+
</goals>
1093+
<configuration>
1094+
<url>https://github.com/virtualcell/vcell-ode/releases/download/${solvers-cvodes-linux.version}/linux64.tgz</url>
1095+
<outputDirectory>${project.build.directory}/../../localsolvers/linux64/${solvers-cvodes-subdirectory.name}</outputDirectory>
1096+
</configuration>
1097+
</execution>
1098+
<execution>
1099+
<id>install-cvodes-solver-win64</id>
1100+
<phase>generate-test-resources</phase>
1101+
<goals>
1102+
<goal>wget</goal>
1103+
</goals>
1104+
<configuration>
1105+
<url>https://github.com/virtualcell/vcell-ode/releases/download/${solvers-cvodes-windows.version}/win64.zip</url>
1106+
<unpack>true</unpack>
1107+
<outputDirectory>${project.build.directory}/../../localsolvers/win64/${solvers-cvodes-subdirectory.name}</outputDirectory>
1108+
<skipCache>true</skipCache>
1109+
</configuration>
1110+
</execution>
1111+
<execution>
1112+
<id>install-cvodes-solver-mac64</id>
1113+
<phase>generate-test-resources</phase>
1114+
<goals>
1115+
<goal>wget</goal>
1116+
</goals>
1117+
<configuration>
1118+
<url>https://github.com/virtualcell/vcell-ode/releases/download/${solvers-cvodes-mac.version}/mac64.tgz</url>
1119+
<unpack>true</unpack>
1120+
<outputDirectory>${project.build.directory}/../../localsolvers/mac64/${solvers-cvodes-subdirectory.name}</outputDirectory>
1121+
</configuration>
1122+
</execution>
10511123
<execution>
10521124
<id>install-langevin-win64</id>
10531125
<phase>generate-test-resources</phase>

‎vcell-core/src/main/java/cbit/vcell/solver/SolverFamily.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
public enum SolverFamily {
77
FVSOLVER("fvsolver"),
8+
CVODES("cvodes"),
89
LANGEVIN("langevin"),
910
OTHER("other");
1011

@@ -14,7 +15,7 @@ public enum SolverFamily {
1415
SolverFamily.mapping.put(SolverExecutable.VCellChombo, SolverFamily.OTHER);
1516
SolverFamily.mapping.put(SolverExecutable.FiniteVolume, SolverFamily.FVSOLVER);
1617
SolverFamily.mapping.put(SolverExecutable.FiniteVolume_PETSc, SolverFamily.OTHER);
17-
SolverFamily.mapping.put(SolverExecutable.SundialsOde, SolverFamily.OTHER);
18+
SolverFamily.mapping.put(SolverExecutable.SundialsOde, SolverFamily.CVODES);
1819
SolverFamily.mapping.put(SolverExecutable.Gibson, SolverFamily.OTHER);
1920
SolverFamily.mapping.put(SolverExecutable.Hybrid_EM, SolverFamily.OTHER);
2021
SolverFamily.mapping.put(SolverExecutable.Hybrid_Mil, SolverFamily.OTHER);

0 commit comments

Comments
 (0)