Skip to content

Commit 9e7adfa

Browse files
committed
Merge branch 'master' into gh-pages
2 parents a61a4c7 + b594d9d commit 9e7adfa

227 files changed

Lines changed: 5099 additions & 5419 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,16 @@ Course participants are expected to have their own laptops/PCs. We use _Git_ as
5252
We will make extensive use of C++ and/or Python as programming language and its
5353
myriad of available libraries. You can also use compiled languages like Rust, Julia, Fortran etc if you prefer. Beware that in case you use Rust or Julia we may not be able to help you properly at the lab.
5454

55+
The focus during the lectures will be on C++. Please read the intro to C++ programming at http://compphysics.github.io/ComputationalPhysics/doc/pub/learningcpp/html/learningcpp-bs.html
5556

56-
If you have Python installed (we strongly recommend Python3) and you feel
57+
This link contains info about installing compilers as well.
58+
59+
If you have Python installed and you feel
5760
pretty familiar with installing different packages, we recommend that
5861
you install the following Python packages via _pip_ as
5962

60-
* pip install numpy scipy matplotlib ipython scikit-learn mglearn sympy pandas pillow
63+
* pip install numpy scipy matplotlib ipython sympy
64+
and obviously many other packages.
6165

6266
For OSX users we recommend, after having installed Xcode, to
6367
install _brew_. Brew allows for a seamless installation of additional
@@ -68,7 +72,7 @@ software via for example
6872
For Linux users, with its variety of distributions like for example the widely popular Ubuntu distribution,
6973
you can use _pip_ as well and simply install Python as
7074

71-
* sudo apt-get install python3
75+
* sudo apt-get install python
7276

7377
### Python installers
7478

@@ -110,6 +114,18 @@ Here we list several useful Python libraries we strongly recommend (if you use a
110114
* _Keras_:https://keras.io/ is a high-level neural networks API, written in Python and capable of running on top of TensorFlow, CNTK, or Theano
111115
* And many more such as _pytorch_:https://pytorch.org/, _Theano_:https://pypi.org/project/Theano/ etc
112116

117+
## Textbooks
118+
119+
_Recommended textbooks_:
120+
- Morten Hjorth-Jensen, Introduction to Computational Physics, IoP, in press. The version from 2015 at https://github.com/CompPhysics/ComputationalPhysics/blob/master/doc/Lectures/lectures2015.pdf will be updated shortly.
121+
- Philipp O.J. Scherer, Computational Physics, Simulation of Classical and Quantum Systems, https://link.springer.com/book/10.1007/978-3-319-00401-3 (can be downloaded for free if you are connected with a UiO IP-number).
122+
123+
124+
## Face coverings.
125+
As of now this is not required, but the situation may change. If face covering will be required during the semester, we will fill in more details.
126+
127+
## Physical distancing
128+
We will be practicing physical distancing in the classroom dedicated to the lab sessions. Thus, everybody should maintain at least one meter distance between themselves and others (excluding those with whom they live). This applies to all aspects of the classroom setting, including seating arrangements, informal conversations, and dialogue between teachers and students.
113129

114130
## Personal Hygiene
115131
All participants attending the laboratory sessions must maintain proper hygiene and health practices, including:

doc/pub/intro/html/._intro-bs000.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<center>[2] <b>Department of Physics and Astronomy and National Superconducting Cyclotron Laboratory, Michigan State University</b></center>
148148
<br>
149149
<p>
150-
<center><h4>Nov 14, 2019</h4></center> <!-- date -->
150+
<center><h4>Aug 19, 2020</h4></center> <!-- date -->
151151
<br>
152152
<p>
153153

@@ -189,7 +189,7 @@
189189

190190

191191
<center style="font-size:80%">
192-
<!-- copyright --> &copy; 1999-2019, Morten Hjorth-Jensen. Released under CC Attribution-NonCommercial 4.0 license
192+
<!-- copyright --> &copy; 1999-2020, Morten Hjorth-Jensen. Released under CC Attribution-NonCommercial 4.0 license
193193
</center>
194194

195195

doc/pub/intro/html/._intro-bs001.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,8 @@ <h2 id="___sec0" class="anchor">Overview of first week </h2>
140140
<li> Thursday: Second Lecture: Introduction to C++ programming (chapters 2 and 3 of lecture notes) and start discussion of project 1.</li>
141141
<li> Friday: Numerical precision and C++ programming, continued and discussion of project 1 (chapter 2 and 3 of lecture notes)</li>
142142
<li> Numerical differentiation and loss of numerical precision (chapter 3 lecture notes)</li>
143-
<li> Computer lab: Thursday and Friday. First time: Thursday and Friday this week, Presentation of hardware and software The first two weeks we focus on simple programming exercises, start with project 1 and to set up GitHub/GitLab (with <b>git</b> as version control software) and QTcreator as IDE (integrated Development Environment). This week we discuss how to set up git and obtain a GitHub/GitLab account and look at simple programming exercises and for those interested start with project 1.</li>
143+
<li> Computer lab: Thursday and Friday. First time: Thursday and Friday this week, Presentation of hardware and software The first two weeks we focus on simple programming exercises, start with project 1 and to set up GitHub/GitLab (with <b>git</b> as version control software) and QTcreator as IDE (integrated Development Environment). This week we discuss how to set up git and obtain a GitHub/GitLab account and look at simple programming exercises and for those interested start with project 1. We discuss also how to install C++ compilers.</li>
144144
<li> The recommended programming exercises for the first week: Exercises 3.1, 2.1 and 2.2 in <a href="https://github.com/CompPhysics/ComputationalPhysics/blob/master/doc/Lectures/lectures2015.pdf" target="_self">Lecture notes</a>. <b>Exercise 3.1 is the most relevant for project 1.</b></li>
145-
<li> We will often use the first hour of each lab session to discuss technicalities and relevant software.</li>
146145
</ul>
147146
</div>
148147
</div>

doc/pub/intro/html/._intro-bs003.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ <h2 id="___sec2" class="anchor">Lectures and ComputerLab </h2>
136136
<p> <!-- subsequent paragraphs come in larger fonts, so start with a paragraph -->
137137

138138
<ul>
139-
<li> Lectures: Thursday (8.15am-10am) and Friday (8.15am-10am), Store Fys Aud.</li>
140-
<li> Weekly reading assignments needed to solve projects.</li>
139+
<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>
140+
<li> Weekly reading assignments needed to solve projects. This includes written material and videos as well</li>
141141
<li> First hour of each lab session may be used to discuss technicalities, address questions etc linked with projects.</li>
142142
<li> Detailed lecture notes, exercises, all programs presented, projects etc can be found at the homepage of the course.</li>
143143
<li> Computerlab: Thursday (10am-6pm, room FV203, 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.</li>

doc/pub/intro/html/._intro-bs005.html

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,32 +136,60 @@ <h2 id="___sec4" class="anchor">Teachers and ComputerLab </h2>
136136
<p> <!-- subsequent paragraphs come in larger fonts, so start with a paragraph -->
137137

138138
<p>
139-
<b>Teachers :</b>
139+
<b>Teachers:</b>
140140

141-
<ol>
142-
<li> <a href="https://www.mn.uio.no/fysikk/?vrtx=person-view&uid=jonassl" target="_self">Jonas Gahr Lunde</a></li>
143-
<li> <a href="https://www.mn.uio.no/astro/?vrtx=person-view&uid=daniehei" target="_self">Daniel Heinesen</a></li>
144-
<li> <a href="http://mhjgit.github.io/info/doc/web/" target="_self">Morten Hjorth-Jensen</a></li>
145-
<li> <a href="https://www.mn.uio.no/fysikk/?vrtx=person-view&uid=arams" target="_self">Aram Sahili</a></li>
146-
<li> Halvard Sutterud</li>
147-
</ol>
141+
<ul>
142+
<li> Morten Hjorth-Jensen</li>
143+
144+
<ul>
145+
<li> <b>Email</b>: morten.hjorth-jensen@fys.uio.no</li>
146+
<li> <b>Phone</b>: +47-48257387</li>
147+
<li> <b>Office</b>: Department of Physics, University of Oslo, Eastern wing room 470</li>
148+
<li> <b>Office hours</b>: <em>Anytime</em>! In Fall Semester 2020 (FS20), as a rule of thumb office hours are planned via computer or telephone. Individual or group office hours will be performed via zoom. Feel free to send an email for planning. In person meetings may also be possible if allowed by the University of Oslo's COVID-19 instructions.</li>
149+
</ul>
150+
151+
<li> Anders Kvellestad</li>
152+
153+
<ul>
154+
<li> <b>Email</b>: anders.kvellestad@fys.uio.no</li>
155+
<li> <b>Office</b>: Department of Physics, University of Oslo, Eastern wing room 447</li>
156+
</ul>
157+
158+
</ul>
159+
160+
<b>Teaching Assistants FS20:</b>
161+
162+
<ul>
163+
<li> Sebastian G. Wither-Larsen, s.g.winther-larsen@fys.uio.no</li>
164+
165+
<ul>
166+
<li> <b>Office</b>: Department of Physics, University of Oslo, Eastern wing room 454</li>
167+
</ul>
168+
169+
<li> Ren&#233; Alexander Ask, r.a.ask@fys.uio.no</li>
170+
<li> Kaspara G&#229;sv&#230;r, k.s.gasvar@fys.uio.no</li>
171+
<li> Maria Linea Horgen, m.l.horgen@fys.uio.no</li>
172+
<li> Aksel Graneng, akselgraneng@gmail.com</li>
173+
</ul>
148174

149175

150176
<div class="row">
151-
<div class="col-xs-7">
177+
<div class="col-xs-4">
152178
<table class="table table-striped table-hover table-condensed">
153179
<thead>
154-
<tr><td align="center"><b> day </b></td> <td align="center"><b> teacher </b></td> </tr>
180+
<tr><td align="center"><b> Thursday </b></td> <td align="center"><b> Friday </b></td> </tr>
155181
</thead>
156182
<tbody>
157-
<tr><td align="left"> Group 1: Thursday 10am-2pm </td> <td align="left"> Aram, Daniel, Halvard, Jonas og Morten </td> </tr>
158-
<tr><td align="left"> Group 2: Thursday 2pm-6pm </td> <td align="left"> Aram, Daniel, Halvard, Jonas og Morten </td> </tr>
159-
<tr><td align="left"> Group 3: Friday 10am-2pm </td> <td align="left"> Aram, Daniel, Halvard, Jonas og Morten </td> </tr>
160-
<tr><td align="left"> Group 4: Friday 2pm-6pm </td> <td align="left"> Aram, Daniel, Halvard, Jonas og Morten </td> </tr>
183+
<tr><td align="left"> Group 1: 10am-12pm </td> <td align="left"> Group 5: 10am-12pm </td> </tr>
184+
<tr><td align="left"> Group 2: 12pm-2pm </td> <td align="left"> Group 6: 12pm-2pm </td> </tr>
185+
<tr><td align="left"> Group 3: 2pm-4pm </td> <td align="left"> Group 7: 2pm-4pm </td> </tr>
186+
<tr><td align="left"> Group 4: 4pm-6pm </td> <td align="left"> Group 8: 4pm-6pm </td> </tr>
161187
</tbody>
162188
</table>
163-
</div> <!-- col-xs-7 -->
189+
</div> <!-- col-xs-4 -->
164190
</div> <!-- cell row -->
191+
Groups are in person but we are also planning fully online groups if needed.
192+
165193
<p>
166194
</div>
167195
</div>

doc/pub/intro/html/._intro-bs006.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ <h2 id="___sec5" class="anchor">Deadlines for projects (end of day, tentative de
140140
<li> Project 2: September 30 (not graded, only feedback)</li>
141141
<li> Project 3: October 21 (graded with feedback)</li>
142142
<li> Project 4: November 18 (graded with feedback)</li>
143-
<li> Project 5: December 15 (graded with feedback)</li>
143+
<li> Project 5: December 9 (graded with feedback)</li>
144144
</ol>
145145

146-
Projects are handed in using devilry.ifi.uio.no. We use Github as repository for codes, benchmark calculations etc. Comments and feedback on projects only via devilry.
146+
Projects are handed in using <b>canvas</b>. We use Github or GitLab (eventually Bitbucket) as repository for codes, benchmark calculations etc. Comments and feedback on projects only via <b>canvas</b>.
147147

148148
<p>
149149
</div>

doc/pub/intro/html/._intro-bs019.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,11 @@ <h2 id="___sec18" class="anchor">Extremely useful tools, strongly recommended </
136136
<p> <!-- subsequent paragraphs come in larger fonts, so start with a paragraph -->
137137

138138
<ul>
139-
<li> GIT for version control (see webpage), this week</li>
139+
<li> GIT for version control (see webpage), this week at lab</li>
140140
<li> ipython notebook</li>
141-
<li> QTcreator for editing and mastering computational projects (for C++ codes, see webpage of course), next week</li>
142-
<li> Armadillo as a useful numerical library for C++, highly recommended, week 36 and rest of semester</li>
141+
<li> QTcreator for editing and mastering computational projects (for C++ codes, see webpage of course), discussed during second week</li>
142+
<li> Armadillo or Eigen as a useful numerical libraries for C++, highly recommended, week 36 and rest of semester</li>
143143
<li> Unit tests, week 37 and later</li>
144-
<li> Devilry for handing in projects, next week</li>
145144
</ul>
146145
</div>
147146
</div>

doc/pub/intro/html/intro-bs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<center>[2] <b>Department of Physics and Astronomy and National Superconducting Cyclotron Laboratory, Michigan State University</b></center>
148148
<br>
149149
<p>
150-
<center><h4>Nov 14, 2019</h4></center> <!-- date -->
150+
<center><h4>Aug 19, 2020</h4></center> <!-- date -->
151151
<br>
152152
<p>
153153

@@ -189,7 +189,7 @@
189189

190190

191191
<center style="font-size:80%">
192-
<!-- copyright --> &copy; 1999-2019, Morten Hjorth-Jensen. Released under CC Attribution-NonCommercial 4.0 license
192+
<!-- copyright --> &copy; 1999-2020, Morten Hjorth-Jensen. Released under CC Attribution-NonCommercial 4.0 license
193193
</center>
194194

195195

0 commit comments

Comments
 (0)