Bladeren bron

Updating runSolver to store model and parameter files with the job

Andrej 2 jaren geleden
bovenliggende
commit
992523c83b
3 gewijzigde bestanden met toevoegingen van 27 en 4 verwijderingen
  1. 17 2
      pythonScripts/compartmentModel.ipynb
  2. 2 2
      pythonScripts/convolveLogNormal.ipynb
  3. 8 0
      pythonScripts/runSolver.py

File diff suppressed because it is too large
+ 17 - 2
pythonScripts/compartmentModel.ipynb


+ 2 - 2
pythonScripts/convolveLogNormal.ipynb

@@ -67,7 +67,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -81,7 +81,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.10.6"
   }
  },
  "nbformat": 4,

+ 8 - 0
pythonScripts/runSolver.py

@@ -6,6 +6,7 @@ import json
 import numpy
 import time
 import scipy.interpolate
+import shutil
 
 defaultValues={\
       'method':'LSODA',\
@@ -178,6 +179,13 @@ def main(parFiles,jobDir,startDir='NONE'):
    with open(setupOut,'w+') as f:
       f.write(json.dumps(setup))
       #this is 3D, so new routines
+   #write model and parameter file
+   origFiles=[modelFile,parameterFile]
+   outFiles=["model.json","parameters.json"]
+   for x in zip(origFiles,outFiles):
+      xOut=os.path.join(jobDir,x[1])
+      shutil.copyfile(x[0],x[1])
+
 
 def interpolate(setup,model,t,s1,t0,tmax):
    #interpolate on s1

Some files were not shown because too many files changed in this diff