From 9cfa4a959fdbae967935ad3bc4b0a07b9d724da3 Mon Sep 17 00:00:00 2001
From: NT <nils.thuerey@tum.de>
Date: Tue, 31 Aug 2021 13:54:28 +0200
Subject: [PATCH] updated download and phiflow install links

---
 diffphys-code-burgers.ipynb |  5 +++--
 diffphys-code-sol.ipynb     | 15 ++++++++-------
 overview-burgers-forw.ipynb |  3 ++-
 overview-ns-forw.ipynb      |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/diffphys-code-burgers.ipynb b/diffphys-code-burgers.ipynb
index 5eedd5c..3f900f8 100644
--- a/diffphys-code-burgers.ipynb
+++ b/diffphys-code-burgers.ipynb
@@ -28,7 +28,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install --upgrade --quiet phiflow \n",
+    "#!pip install --upgrade --quiet phiflow\n",
+    "!pip install --upgrade --quiet git+https://github.com/tum-pbs/PhiFlow@develop \n",
     "from phi.tf.flow import *\n",
     "\n",
     "N = 128\n",
@@ -589,4 +590,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
\ No newline at end of file
+}
diff --git a/diffphys-code-sol.ipynb b/diffphys-code-sol.ipynb
index 1e4165b..bc1efc0 100644
--- a/diffphys-code-sol.ipynb
+++ b/diffphys-code-sol.ipynb
@@ -140,10 +140,10 @@
    "source": [
     "import os, sys, logging, argparse, pickle, glob, random, distutils.dir_util, urllib.request\n",
     "\n",
-    "fname_train = 'pbdl-sol-karman-2d-train.pickle'\n",
+    "fname_train = 'sol-karman-2d-train.pickle'\n",
     "if not os.path.isfile(fname_train):\n",
     "  print(\"Downloading training data (73MB), this can take a moment the first time...\")\n",
-    "  urllib.request.urlretrieve(\"https://ge.in.tum.de/download/2020-solver-in-the-loop/\"+fname_train, fname_train)\n",
+    "  urllib.request.urlretrieve(\"https://physicsbaseddeeplearning.org/data/\"+fname_train, fname_train)\n",
     "\n",
     "with open(fname_train, 'rb') as f: data_preloaded = pickle.load(f)\n",
     "print(\"Loaded data, {} training sims\".format(len(data_preloaded)) )\n"
@@ -170,7 +170,8 @@
    },
    "outputs": [],
    "source": [
-    "!pip install --upgrade --quiet phiflow\n",
+    "#!pip install --upgrade --quiet phiflow\n",
+    "!pip install --upgrade --quiet git+https://github.com/tum-pbs/PhiFlow@develop \n",
     "\n",
     "from phi.tf.flow import *\n",
     "import tensorflow as tf\n",
@@ -912,7 +913,7 @@
     "            loss = training_step_jit(dens_gt, vel_gt, re_nr, math.tensor(steps)) \n",
     "            \n",
     "            steps += 1\n",
-    "            if (j==0 and i<3) or (j==0 and ib==0 and i%32==0) or (j>0 and ib==0 and i%128==0): # reduce output \n",
+    "            if (j==0 and i<3) or (j==0 and ib==0 and i%64==0) or (j>0 and ib==0 and i%248==0): # reduce output \n",
     "              print('epoch {:03d}/{:03d}, batch {:03d}/{:03d}, step {:04d}/{:04d}: loss={}'.format( j+1, EPOCHS, ib+1, dataset.numBatches, i+1, dataset.numSteps, loss ))\n",
     "            \n",
     "            dataset.nextStep()\n",
@@ -969,10 +970,10 @@
     }
    ],
    "source": [
-    "fname_test = 'pbdl-sol-karman-2d-test.pickle'\n",
+    "fname_test = 'sol-karman-2d-test.pickle'\n",
     "if not os.path.isfile(fname_test):\n",
     "  print(\"Downloading test data (38MB), this can take a moment the first time...\")\n",
-    "  urllib.request.urlretrieve(\"https://ge.in.tum.de/download/2020-solver-in-the-loop/\"+fname_test, fname_test)\n",
+    "  urllib.request.urlretrieve(\"https://physicsbaseddeeplearning.org/data/\"+fname_test, fname_test)\n",
     "\n",
     "with open(fname_test, 'rb') as f: data_test_preloaded = pickle.load(f)\n",
     "print(\"Loaded test data, {} training sims\".format(len(data_test_preloaded)) )"
@@ -1353,4 +1354,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 1
-}
\ No newline at end of file
+}
diff --git a/overview-burgers-forw.ipynb b/overview-burgers-forw.ipynb
index c711263..02d3486 100644
--- a/overview-burgers-forw.ipynb
+++ b/overview-burgers-forw.ipynb
@@ -50,7 +50,8 @@
     }
    ],
    "source": [
-    "!pip install --upgrade --quiet phiflow\n",
+    "#!pip install --upgrade --quiet phiflow\n",
+    "!pip install --upgrade --quiet git+https://github.com/tum-pbs/PhiFlow@develop\n",
     "\n",
     "from phi.flow import *\n",
     "\n",
diff --git a/overview-ns-forw.ipynb b/overview-ns-forw.ipynb
index 8907a71..2b122d7 100644
--- a/overview-ns-forw.ipynb
+++ b/overview-ns-forw.ipynb
@@ -45,8 +45,8 @@
    },
    "outputs": [],
    "source": [
-    "#!pip install --upgrade --quiet git+https://github.com/tum-pbs/PhiFlow@develop\n",
     "#!pip install --upgrade --quiet phiflow \n",
+    "!pip install --upgrade --quiet git+https://github.com/tum-pbs/PhiFlow@develop\n",
     "\n",
     "from phi.flow import *  # The Dash GUI is not supported on Google colab, ignore the warning\n",
     "import pylab"