Merge branch 'Argonne2023MayTalk' into develop

QMCSoftware · May 16, 2023 · e5e4b85 · e5e4b85
2 parents ea17692 + 7f5e4cd
commit e5e4b85
Show file tree

Hide file tree

Showing 26 changed files with 486,964 additions and 4 deletions.
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/Argonne_2023_Talk_Figures.ipynb b/demos/talk_paper_demos/Argonne_Talk_2022_May/Argonne_2023_Talk_Figures.ipynb
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/cantileveredbeamwords.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/cantileveredbeamwords.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonpts.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonpts.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonptsproj.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonptsproj.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonptsrand.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonptsrand.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonptsseq.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonptsseq.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonptssingle.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/haltonptssingle.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/iid_ld.pkl b/demos/talk_paper_demos/Argonne_Talk_2022_May/iid_ld.pkl
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/iidldbeam.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/iidldbeam.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/iidptsproj.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/iidptsproj.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/iidptsrand.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/iidptsrand.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/iidptsseq.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/iidptsseq.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/iidptssingle.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/iidptssingle.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/latticeptsproj.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/latticeptsproj.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/latticeptsrand.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/latticeptsrand.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/latticeptsseq.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/latticeptsseq.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/latticeptssingle.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/latticeptssingle.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/ld_parallel.pkl b/demos/talk_paper_demos/Argonne_Talk_2022_May/ld_parallel.pkl
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/ldparallelbeam.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/ldparallelbeam.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/sobolptsproj.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/sobolptsproj.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/sobolptsrand.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/sobolptsrand.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/sobolptsseq.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/sobolptsseq.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/sobolptssingle.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/sobolptssingle.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/traprule.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/traprule.eps
diff --git a/demos/talk_paper_demos/Argonne_Talk_2022_May/traprulef2.eps b/demos/talk_paper_demos/Argonne_Talk_2022_May/traprulef2.eps
diff --git a/demos/talk_paper_demos/Purdue_Talk_2023_March/Purdue_Talk_Figures.ipynb b/demos/talk_paper_demos/Purdue_Talk_2023_March/Purdue_Talk_Figures.ipynb
@@ -325,7 +325,6 @@
    "execution_count": 21,
    "id": "87702a30-03e8-4e92-8860-245bafa654f7",
    "metadata": {
-    "scrolled": false,
     "tags": []
    },
    "outputs": [
@@ -401,7 +400,7 @@
     "fig,ax = plt.subplots(figsize=(6,3))\n",
     "ax.plot(best_solution,'-')\n",
     "ax.set_xlim([0,len(best_solution)-1]); ax.set_xlabel('Position')\n",
-    "ax.set_ylim([1050,-50]);  ax.set_ylabel('Deflection');\n",
+    "ax.set_ylim([1050,-50]);  ax.set_ylabel('Mean Deflection');\n",
     "ax.set_aspect(0.02)\n",
     "fig.suptitle('Cantilevered Beam')\n",
     "fig.savefig(figpath+'cantileveredbeamwords.eps',format='eps',bbox_inches='tight')"
@@ -460,8 +459,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "docker: Error response from daemon: Conflict. The container name \"/muqbp\" is already in use by container \"7f9e0237bd3e72783743efb67f78ce8cc800f5a24835f4191bc423f960cdedac\". You have to remove (or rename) that container to be able to reuse that name.\r\n",
-      "See 'docker run --help'.\r\n"
+      "docker: Error response from daemon: Conflict. The container name \"/muqbp\" is already in use by container \"7f9e0237bd3e72783743efb67f78ce8cc800f5a24835f4191bc423f960cdedac\". You have to remove (or rename) that container to be able to reuse that name.\n",
+      "See 'docker run --help'.\n"
      ]
     }
    ],