Merge branch 'master' into gh-pages

mhjensen · mhjensen · commit d1dd52c1abad · 2020-08-20T05:07:19.000+02:00
diff --git a/doc/pub/intro/html/._intro-bs000.html b/doc/pub/intro/html/._intro-bs000.html
@@ -147,7 +147,7 @@
 <center>[2] <b>Department of Physics and Astronomy and National Superconducting Cyclotron Laboratory, Michigan State University</b></center>
 <br>
 <p>
-<center><h4>Aug 19, 2020</h4></center> <!-- date -->
+<center><h4>Aug 20, 2020</h4></center> <!-- date -->
 <br>
 <p>
 
diff --git a/doc/pub/intro/html/._intro-bs003.html b/doc/pub/intro/html/._intro-bs003.html
@@ -136,11 +136,11 @@ <h2 id="___sec2" class="anchor">Lectures and ComputerLab </h2>
 <p> <!-- subsequent paragraphs come in larger fonts, so start with a paragraph -->
 
 <ul>
-  <li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.</li> 
+  <li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.  The lecture hall has now a reduced capacity of 60 attendees only.</li>
   <li> Weekly reading assignments needed to solve projects. This includes written material and videos as well</li>
   <li> Detailed lecture notes, exercises, all programs presented, projects etc can be found at the homepage of the course.</li>
-  <li> Computerlab: Thursday (10am-6pm, room F&#216;397, Dept of Physics) and Friday (10am-6pm, room F&#216;397, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.</li>
-  <li> Weekly plans and all other information are on the official webpage.</li>
+  <li> Computerlab: Thursday (10am-6pm, room F&#216;397, Dept of Physics) and Friday (10am-6pm, room F&#216;434, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.</li>
+  <li> Weekly plans and all other information are on the <a href="https://www.uio.no/studier/emner/matnat/fys/FYS3150/h20/index.html" target="_self">official webpage</a>.</li>
   <li> No final exam, the last three projects are graded.  In total five projects which all have to be approved.</li> 
 </ul>
 </div>
diff --git a/doc/pub/intro/html/._intro-bs004.html b/doc/pub/intro/html/._intro-bs004.html
@@ -136,7 +136,7 @@ <h2 id="___sec3" class="anchor">Course Format </h2>
 <p> <!-- subsequent paragraphs come in larger fonts, so start with a paragraph -->
 
 <ul>
-  <li> Five compulsory projects. Electronic reports only using <a href="https://devilry.ifi.uio.no/" target="_self">devilry</a> to hand in projects and <a href="https://github.com/" target="_self">Git</a> for repository and all your material.</li>
+  <li> Five compulsory projects. Electronic reports only using <a href="https://devilry.ifi.uio.no/" target="_self">Canvas</a> to hand in projects and <a href="https://git-scm.com/" target="_self">git</a> as version control software and   <a href="https://github.com/" target="_self">GitHub</a> (or <a href="https://about.gitlab.com/" target="_self">GitLab</a>)  for repository and all your material.</li>
   <li> Evaluation and grading: The last three projects are graded and each counts 1/3 of the final mark. No final written or oral exam.</li>
   <li> C/C++ is the default programming language during lectures, but Fortran and Python are also used. All source codes discussed during the lectures can be found at the webpage and <a href="https://github.com/CompPhysics/ComputationalPhysics1/tree/master/doc/Programs" target="_self">github address</a> of the course. We recommend either C/C++, Fortran or Python as programming languages. You can also try Julia or other languages but at the Lab and during the lectures we will focus on the first languages.</li>
 </ul>
diff --git a/doc/pub/intro/html/intro-bs.html b/doc/pub/intro/html/intro-bs.html
@@ -147,7 +147,7 @@
 <center>[2] <b>Department of Physics and Astronomy and National Superconducting Cyclotron Laboratory, Michigan State University</b></center>
 <br>
 <p>
-<center><h4>Aug 19, 2020</h4></center> <!-- date -->
+<center><h4>Aug 20, 2020</h4></center> <!-- date -->
 <br>
 <p>
 
diff --git a/doc/pub/intro/html/intro-reveal.html b/doc/pub/intro/html/intro-reveal.html
@@ -132,7 +132,7 @@
 <center>[2] <b>Department of Physics and Astronomy and National Superconducting Cyclotron Laboratory, Michigan State University</b></center>
 <br>
 <p>&nbsp;<br>
-<center><h4>Aug 19, 2020</h4></center> <!-- date -->
+<center><h4>Aug 20, 2020</h4></center> <!-- date -->
 <br>
 <p>
 
@@ -192,15 +192,15 @@ <h2 id="___sec2">Lectures and ComputerLab </h2>
 <b></b>
 <ul>
 
-<p><li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.</li>
+<p><li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.  The lecture hall has now a reduced capacity of 60 attendees only.</li>
 
 <p><li> Weekly reading assignments needed to solve projects. This includes written material and videos as well</li>
 
 <p><li> Detailed lecture notes, exercises, all programs presented, projects etc can be found at the homepage of the course.</li>
 
-<p><li> Computerlab: Thursday (10am-6pm, room F&#216;397, Dept of Physics) and Friday (10am-6pm, room F&#216;397, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.</li>
+<p><li> Computerlab: Thursday (10am-6pm, room F&#216;397, Dept of Physics) and Friday (10am-6pm, room F&#216;434, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.</li>
 
-<p><li> Weekly plans and all other information are on the official webpage.</li>
+<p><li> Weekly plans and all other information are on the <a href="https://www.uio.no/studier/emner/matnat/fys/FYS3150/h20/index.html" target="_blank">official webpage</a>.</li>
 
 <p><li> No final exam, the last three projects are graded.  In total five projects which all have to be approved.</li> 
 </ul>
@@ -216,7 +216,7 @@ <h2 id="___sec3">Course Format </h2>
 <b></b>
 <ul>
 
-<p><li> Five compulsory projects. Electronic reports only using <a href="https://devilry.ifi.uio.no/" target="_blank">devilry</a> to hand in projects and <a href="https://github.com/" target="_blank">Git</a> for repository and all your material.</li>
+<p><li> Five compulsory projects. Electronic reports only using <a href="https://devilry.ifi.uio.no/" target="_blank">Canvas</a> to hand in projects and <a href="https://git-scm.com/" target="_blank">git</a> as version control software and   <a href="https://github.com/" target="_blank">GitHub</a> (or <a href="https://about.gitlab.com/" target="_blank">GitLab</a>)  for repository and all your material.</li>
 
 <p><li> Evaluation and grading: The last three projects are graded and each counts 1/3 of the final mark. No final written or oral exam.</li>
 
diff --git a/doc/pub/intro/html/intro-solarized.html b/doc/pub/intro/html/intro-solarized.html
@@ -118,7 +118,7 @@
 <center>[2] <b>Department of Physics and Astronomy and National Superconducting Cyclotron Laboratory, Michigan State University</b></center>
 <br>
 <p>
-<center><h4>Aug 19, 2020</h4></center> <!-- date -->
+<center><h4>Aug 20, 2020</h4></center> <!-- date -->
 <br>
 <p>
 <!-- !split --><br><br><br><br><br><br><br><br><br><br>
@@ -170,11 +170,11 @@ <h2 id="___sec2">Lectures and ComputerLab </h2>
 <p>
 
 <ul>
-  <li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.</li> 
+  <li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.  The lecture hall has now a reduced capacity of 60 attendees only.</li>
   <li> Weekly reading assignments needed to solve projects. This includes written material and videos as well</li>
   <li> Detailed lecture notes, exercises, all programs presented, projects etc can be found at the homepage of the course.</li>
-  <li> Computerlab: Thursday (10am-6pm, room F&#216;397, Dept of Physics) and Friday (10am-6pm, room F&#216;397, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.</li>
-  <li> Weekly plans and all other information are on the official webpage.</li>
+  <li> Computerlab: Thursday (10am-6pm, room F&#216;397, Dept of Physics) and Friday (10am-6pm, room F&#216;434, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.</li>
+  <li> Weekly plans and all other information are on the <a href="https://www.uio.no/studier/emner/matnat/fys/FYS3150/h20/index.html" target="_blank">official webpage</a>.</li>
   <li> No final exam, the last three projects are graded.  In total five projects which all have to be approved.</li> 
 </ul>
 </div>
@@ -191,7 +191,7 @@ <h2 id="___sec3">Course Format </h2>
 <p>
 
 <ul>
-  <li> Five compulsory projects. Electronic reports only using <a href="https://devilry.ifi.uio.no/" target="_blank">devilry</a> to hand in projects and <a href="https://github.com/" target="_blank">Git</a> for repository and all your material.</li>
+  <li> Five compulsory projects. Electronic reports only using <a href="https://devilry.ifi.uio.no/" target="_blank">Canvas</a> to hand in projects and <a href="https://git-scm.com/" target="_blank">git</a> as version control software and   <a href="https://github.com/" target="_blank">GitHub</a> (or <a href="https://about.gitlab.com/" target="_blank">GitLab</a>)  for repository and all your material.</li>
   <li> Evaluation and grading: The last three projects are graded and each counts 1/3 of the final mark. No final written or oral exam.</li>
   <li> C/C++ is the default programming language during lectures, but Fortran and Python are also used. All source codes discussed during the lectures can be found at the webpage and <a href="https://github.com/CompPhysics/ComputationalPhysics1/tree/master/doc/Programs" target="_blank">github address</a> of the course. We recommend either C/C++, Fortran or Python as programming languages. You can also try Julia or other languages but at the Lab and during the lectures we will focus on the first languages.</li>
 </ul>
diff --git a/doc/pub/intro/html/intro.html b/doc/pub/intro/html/intro.html
@@ -123,7 +123,7 @@
 <center>[2] <b>Department of Physics and Astronomy and National Superconducting Cyclotron Laboratory, Michigan State University</b></center>
 <br>
 <p>
-<center><h4>Aug 19, 2020</h4></center> <!-- date -->
+<center><h4>Aug 20, 2020</h4></center> <!-- date -->
 <br>
 <p>
 <!-- !split --><br><br><br><br><br><br><br><br><br><br>
@@ -175,11 +175,11 @@ <h2 id="___sec2">Lectures and ComputerLab </h2>
 <p>
 
 <ul>
-  <li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.</li> 
+  <li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.  The lecture hall has now a reduced capacity of 60 attendees only.</li>
   <li> Weekly reading assignments needed to solve projects. This includes written material and videos as well</li>
   <li> Detailed lecture notes, exercises, all programs presented, projects etc can be found at the homepage of the course.</li>
-  <li> Computerlab: Thursday (10am-6pm, room F&#216;397, Dept of Physics) and Friday (10am-6pm, room F&#216;397, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.</li>
-  <li> Weekly plans and all other information are on the official webpage.</li>
+  <li> Computerlab: Thursday (10am-6pm, room F&#216;397, Dept of Physics) and Friday (10am-6pm, room F&#216;434, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.</li>
+  <li> Weekly plans and all other information are on the <a href="https://www.uio.no/studier/emner/matnat/fys/FYS3150/h20/index.html" target="_blank">official webpage</a>.</li>
   <li> No final exam, the last three projects are graded.  In total five projects which all have to be approved.</li> 
 </ul>
 </div>
@@ -196,7 +196,7 @@ <h2 id="___sec3">Course Format </h2>
 <p>
 
 <ul>
-  <li> Five compulsory projects. Electronic reports only using <a href="https://devilry.ifi.uio.no/" target="_blank">devilry</a> to hand in projects and <a href="https://github.com/" target="_blank">Git</a> for repository and all your material.</li>
+  <li> Five compulsory projects. Electronic reports only using <a href="https://devilry.ifi.uio.no/" target="_blank">Canvas</a> to hand in projects and <a href="https://git-scm.com/" target="_blank">git</a> as version control software and   <a href="https://github.com/" target="_blank">GitHub</a> (or <a href="https://about.gitlab.com/" target="_blank">GitLab</a>)  for repository and all your material.</li>
   <li> Evaluation and grading: The last three projects are graded and each counts 1/3 of the final mark. No final written or oral exam.</li>
   <li> C/C++ is the default programming language during lectures, but Fortran and Python are also used. All source codes discussed during the lectures can be found at the webpage and <a href="https://github.com/CompPhysics/ComputationalPhysics1/tree/master/doc/Programs" target="_blank">github address</a> of the course. We recommend either C/C++, Fortran or Python as programming languages. You can also try Julia or other languages but at the Lab and during the lectures we will focus on the first languages.</li>
 </ul>
diff --git a/doc/pub/intro/ipynb/ipynb-intro-src.tar.gz b/doc/pub/intro/ipynb/ipynb-intro-src.tar.gz
diff --git a/doc/pub/intro/pdf/intro-print.pdf b/doc/pub/intro/pdf/intro-print.pdf
diff --git a/doc/src/intro/intro.do.txt b/doc/src/intro/intro.do.txt
@@ -29,19 +29,19 @@ DATE: today
 ===== Lectures and ComputerLab =====
 
 !bblock
-  * Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style. 
+  * Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud, but due to Covid-19 all lectures, unless announced, will be fully online and in a flipped style.  The lecture hall has now a reduced capacity of 60 attendees only.
   * Weekly reading assignments needed to solve projects. This includes written material and videos as well
   * Detailed lecture notes, exercises, all programs presented, projects etc can be found at the homepage of the course.
-  * Computerlab: Thursday (10am-6pm, room FØ397, Dept of Physics) and Friday (10am-6pm, room FØ397, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.
-  * Weekly plans and all other information are on the official webpage.
+  * Computerlab: Thursday (10am-6pm, room FØ397, Dept of Physics) and Friday (10am-6pm, room FØ434, Dept of Physics). Depending on the number of participants, we may extend to more lab sessions. Please bring your own laptops to the lab sessions.  We may also organize online lab sessions.
+  * Weekly plans and all other information are on the "official webpage":"https://www.uio.no/studier/emner/matnat/fys/FYS3150/h20/index.html".
   * No final exam, the last three projects are graded.  In total five projects which all have to be approved. 
 !eblock
 
 !split
 ===== Course Format =====
 
 !bblock
-  * Five compulsory projects. Electronic reports only using "devilry":"https://devilry.ifi.uio.no/" to hand in projects and "Git":"https://github.com/" for repository and all your material.
+  * Five compulsory projects. Electronic reports only using "Canvas":"https://devilry.ifi.uio.no/" to hand in projects and "git":"https://git-scm.com/" as version control software and   "GitHub":"https://github.com/" (or "GitLab":"https://about.gitlab.com/")  for repository and all your material.
   * Evaluation and grading: The last three projects are graded and each counts 1/3 of the final mark. No final written or oral exam.
   * C/C++ is the default programming language during lectures, but Fortran and Python are also used. All source codes discussed during the lectures can be found at the webpage and "github address":"https://github.com/CompPhysics/ComputationalPhysics1/tree/master/doc/Programs" of the course. We recommend either C/C++, Fortran or Python as programming languages. You can also try Julia or other languages but at the Lab and during the lectures we will focus on the first languages.
 !eblock
