Skip to content

Commit 0268f8c

Browse files
committed
Merge branch 'master' into gh-pages
2 parents 809de93 + 811a253 commit 0268f8c

23 files changed

Lines changed: 3224 additions & 38 deletions

doc/Projects/2019/Project1/html/._Project1-bs000.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<center><b>Department of Physics, University of Oslo, Norway</b></center>
131131
<br>
132132
<p>
133-
<center><h4>Aug 22, 2019</h4></center> <!-- date -->
133+
<center><h4>Aug 19, 2020</h4></center> <!-- date -->
134134
<br>
135135
<p>
136136
</div> <!-- end jumbotron -->
@@ -145,7 +145,7 @@ <h2 id="___sec0" class="anchor">Introduction </h2>
145145

146146
<ul>
147147
<li> For this exercise we recommend that you make your own functions for dynamic memory allocation of a vector and a matrix. You don't need to write a class for this operations. Use then the library package lib.cpp with its header file lib.hpp for obtaining LU-decomposed matrices, solve linear equations etc.</li>
148-
<li> A very good and often recommended library for C++ handling of arrays is the library Armadillo, to be found at \url{arma.sourceforge.net}. We will discuss the usage of this library during the lab sessions and lectures. Armadillo has also an interface to Lapack functions for solving systems of linear equations.</li>
148+
<li> A very good and often recommended library for C++ handling of arrays is the library Armadillo, to be found at \url{arma.sourceforge.net}. We will discuss the usage of this library during the lab sessions and lectures. Armadillo has also an interface to Lapack functions for solving systems of linear equations. Alternatively you can use the <a href="http://eigen.tuxfamily.org/index.php?title=Main_Page" target="_self">Eigen</a> library, which has much of the same functionality as Armadillo.</li>
149149
</ul>
150150

151151
Your program, whether it is written in C++, Python, Fortran or other languages, should include
@@ -357,6 +357,7 @@ <h3 id="___sec4" class="anchor">Project 1 d): </h3>
357357

358358
<h3 id="___sec5" class="anchor">Project 1 e): </h3>
359359

360+
<p>
360361
Compare your results with those from the LU decomposition codes for the matrix of sizes \( 10\times 10 \), \( 100\times 100 \) and
361362
\( 1000\times 1000 \). Here you should use the library functions provided on the webpage of the course. Alternatively, if you use armadillo as a library, you can use the similar function for LU decomposition. The armadillo function for the LU decomposition is called \( LU \) while the function for solving linear sets of equations is called \( solve \).
362363
Use for example the unix function <em>time</em> when you run your codes
@@ -412,6 +413,8 @@ <h3 id="___sec5" class="anchor">Project 1 e): </h3>
412413

413414
<span style="color: #008000; font-weight: bold">END PROGRAM </span><span style="color: #008000">time</span>
414415
</pre></div>
416+
<p>
417+
Your results may depend on the granularity of the clock.
415418

416419
<h2 id="___sec6" class="anchor">Introduction to numerical projects </h2>
417420

@@ -437,11 +440,11 @@ <h2 id="___sec7" class="anchor">Format for electronic delivery of report and pro
437440
The preferred format for the report is a PDF file. You can also use DOC or postscript formats or as an ipython notebook file. As programming language we prefer that you choose between C/C++, Fortran2008 or Python. The following prescription should be followed when preparing the report:
438441

439442
<ul>
440-
<li> Use Devilry to hand in your projects, log in at <a href="http://devilry.ifi.uio.no" target="_self"><tt>http://devilry.ifi.uio.no</tt></a> with your normal UiO username and password and choose either 'fys3150' or 'fys4150'. There you can load up the files within the deadline.</li>
441-
<li> Upload <b>only</b> the report file! For the source code file(s) you have developed please provide us with your link to your github domain. The report file should include all of your discussions and a list of the codes you have developed. Do not include library files which are available at the course homepage, unless you have made specific changes to them.</li>
443+
<li> Use <b>Canvas</b> to hand in your projects, log in at <a href="https://www.uio.no/english/services/it/education/canvas/" target="_self"><tt>https://www.uio.no/english/services/it/education/canvas/</tt></a> with your normal UiO username and password.</li>
444+
<li> Upload <b>only</b> the report file! For the source code file(s) you have developed please provide us with your link to your github domain. The report file should include all of your discussions and a list of the codes you have developed. Do not include library files which are available at the course homepage, unless you have made specific changes to them. Alternatively, you can just upload the address to your GitHub or GitLab repository.</li>
442445
<li> In your git repository, please include a folder which contains selected results. These can be in the form of output from your code for a selected set of runs and input parameters.</li>
443446
<li> In this and all later projects, you should include tests (for example unit tests) of your code(s).</li>
444-
<li> Comments from us on your projects, approval or not, corrections to be made etc can be found under your Devilry domain and are only visible to you and the teachers of the course.</li>
447+
<li> Comments from us on your projects, approval or not, corrections to be made etc can be found under your <b>Canvas</b> domain and are only visible to you and the teachers of the course.</li>
445448
</ul>
446449

447450
Finally,
@@ -470,7 +473,7 @@ <h2 id="___sec7" class="anchor">Format for electronic delivery of report and pro
470473

471474

472475
<center style="font-size:80%">
473-
<!-- copyright --> &copy; 1999-2019, "Computational Physics I FYS3150/FYS4150":"http://www.uio.no/studier/emner/matnat/fys/FYS3150/index-eng.html". Released under CC Attribution-NonCommercial 4.0 license
476+
<!-- copyright --> &copy; 1999-2020, "Computational Physics I FYS3150/FYS4150":"http://www.uio.no/studier/emner/matnat/fys/FYS3150/index-eng.html". Released under CC Attribution-NonCommercial 4.0 license
474477
</center>
475478

476479

doc/Projects/2019/Project1/html/Project1-bs.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<center><b>Department of Physics, University of Oslo, Norway</b></center>
131131
<br>
132132
<p>
133-
<center><h4>Aug 22, 2019</h4></center> <!-- date -->
133+
<center><h4>Aug 19, 2020</h4></center> <!-- date -->
134134
<br>
135135
<p>
136136
</div> <!-- end jumbotron -->
@@ -145,7 +145,7 @@ <h2 id="___sec0" class="anchor">Introduction </h2>
145145

146146
<ul>
147147
<li> For this exercise we recommend that you make your own functions for dynamic memory allocation of a vector and a matrix. You don't need to write a class for this operations. Use then the library package lib.cpp with its header file lib.hpp for obtaining LU-decomposed matrices, solve linear equations etc.</li>
148-
<li> A very good and often recommended library for C++ handling of arrays is the library Armadillo, to be found at \url{arma.sourceforge.net}. We will discuss the usage of this library during the lab sessions and lectures. Armadillo has also an interface to Lapack functions for solving systems of linear equations.</li>
148+
<li> A very good and often recommended library for C++ handling of arrays is the library Armadillo, to be found at \url{arma.sourceforge.net}. We will discuss the usage of this library during the lab sessions and lectures. Armadillo has also an interface to Lapack functions for solving systems of linear equations. Alternatively you can use the <a href="http://eigen.tuxfamily.org/index.php?title=Main_Page" target="_self">Eigen</a> library, which has much of the same functionality as Armadillo.</li>
149149
</ul>
150150

151151
Your program, whether it is written in C++, Python, Fortran or other languages, should include
@@ -357,6 +357,7 @@ <h3 id="___sec4" class="anchor">Project 1 d): </h3>
357357

358358
<h3 id="___sec5" class="anchor">Project 1 e): </h3>
359359

360+
<p>
360361
Compare your results with those from the LU decomposition codes for the matrix of sizes \( 10\times 10 \), \( 100\times 100 \) and
361362
\( 1000\times 1000 \). Here you should use the library functions provided on the webpage of the course. Alternatively, if you use armadillo as a library, you can use the similar function for LU decomposition. The armadillo function for the LU decomposition is called \( LU \) while the function for solving linear sets of equations is called \( solve \).
362363
Use for example the unix function <em>time</em> when you run your codes
@@ -412,6 +413,8 @@ <h3 id="___sec5" class="anchor">Project 1 e): </h3>
412413

413414
<span style="color: #008000; font-weight: bold">END PROGRAM </span><span style="color: #008000">time</span>
414415
</pre></div>
416+
<p>
417+
Your results may depend on the granularity of the clock.
415418

416419
<h2 id="___sec6" class="anchor">Introduction to numerical projects </h2>
417420

@@ -437,11 +440,11 @@ <h2 id="___sec7" class="anchor">Format for electronic delivery of report and pro
437440
The preferred format for the report is a PDF file. You can also use DOC or postscript formats or as an ipython notebook file. As programming language we prefer that you choose between C/C++, Fortran2008 or Python. The following prescription should be followed when preparing the report:
438441

439442
<ul>
440-
<li> Use Devilry to hand in your projects, log in at <a href="http://devilry.ifi.uio.no" target="_self"><tt>http://devilry.ifi.uio.no</tt></a> with your normal UiO username and password and choose either 'fys3150' or 'fys4150'. There you can load up the files within the deadline.</li>
441-
<li> Upload <b>only</b> the report file! For the source code file(s) you have developed please provide us with your link to your github domain. The report file should include all of your discussions and a list of the codes you have developed. Do not include library files which are available at the course homepage, unless you have made specific changes to them.</li>
443+
<li> Use <b>Canvas</b> to hand in your projects, log in at <a href="https://www.uio.no/english/services/it/education/canvas/" target="_self"><tt>https://www.uio.no/english/services/it/education/canvas/</tt></a> with your normal UiO username and password.</li>
444+
<li> Upload <b>only</b> the report file! For the source code file(s) you have developed please provide us with your link to your github domain. The report file should include all of your discussions and a list of the codes you have developed. Do not include library files which are available at the course homepage, unless you have made specific changes to them. Alternatively, you can just upload the address to your GitHub or GitLab repository.</li>
442445
<li> In your git repository, please include a folder which contains selected results. These can be in the form of output from your code for a selected set of runs and input parameters.</li>
443446
<li> In this and all later projects, you should include tests (for example unit tests) of your code(s).</li>
444-
<li> Comments from us on your projects, approval or not, corrections to be made etc can be found under your Devilry domain and are only visible to you and the teachers of the course.</li>
447+
<li> Comments from us on your projects, approval or not, corrections to be made etc can be found under your <b>Canvas</b> domain and are only visible to you and the teachers of the course.</li>
445448
</ul>
446449

447450
Finally,
@@ -470,7 +473,7 @@ <h2 id="___sec7" class="anchor">Format for electronic delivery of report and pro
470473

471474

472475
<center style="font-size:80%">
473-
<!-- copyright --> &copy; 1999-2019, "Computational Physics I FYS3150/FYS4150":"http://www.uio.no/studier/emner/matnat/fys/FYS3150/index-eng.html". Released under CC Attribution-NonCommercial 4.0 license
476+
<!-- copyright --> &copy; 1999-2020, "Computational Physics I FYS3150/FYS4150":"http://www.uio.no/studier/emner/matnat/fys/FYS3150/index-eng.html". Released under CC Attribution-NonCommercial 4.0 license
474477
</center>
475478

476479

doc/Projects/2019/Project1/html/Project1.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<center><b>Department of Physics, University of Oslo, Norway</b></center>
9292
<br>
9393
<p>
94-
<center><h4>Aug 22, 2019</h4></center> <!-- date -->
94+
<center><h4>Aug 19, 2020</h4></center> <!-- date -->
9595
<br>
9696

9797
<h2 id="___sec0">Introduction </h2>
@@ -104,7 +104,7 @@ <h2 id="___sec0">Introduction </h2>
104104

105105
<ul>
106106
<li> For this exercise we recommend that you make your own functions for dynamic memory allocation of a vector and a matrix. You don't need to write a class for this operations. Use then the library package lib.cpp with its header file lib.hpp for obtaining LU-decomposed matrices, solve linear equations etc.</li>
107-
<li> A very good and often recommended library for C++ handling of arrays is the library Armadillo, to be found at \url{arma.sourceforge.net}. We will discuss the usage of this library during the lab sessions and lectures. Armadillo has also an interface to Lapack functions for solving systems of linear equations.</li>
107+
<li> A very good and often recommended library for C++ handling of arrays is the library Armadillo, to be found at \url{arma.sourceforge.net}. We will discuss the usage of this library during the lab sessions and lectures. Armadillo has also an interface to Lapack functions for solving systems of linear equations. Alternatively you can use the <a href="http://eigen.tuxfamily.org/index.php?title=Main_Page" target="_blank">Eigen</a> library, which has much of the same functionality as Armadillo.</li>
108108
</ul>
109109

110110
Your program, whether it is written in C++, Python, Fortran or other languages, should include
@@ -316,6 +316,7 @@ <h3 id="___sec4">Project 1 d): </h3>
316316

317317
<h3 id="___sec5">Project 1 e): </h3>
318318

319+
<p>
319320
Compare your results with those from the LU decomposition codes for the matrix of sizes \( 10\times 10 \), \( 100\times 100 \) and
320321
\( 1000\times 1000 \). Here you should use the library functions provided on the webpage of the course. Alternatively, if you use armadillo as a library, you can use the similar function for LU decomposition. The armadillo function for the LU decomposition is called \( LU \) while the function for solving linear sets of equations is called \( solve \).
321322
Use for example the unix function <em>time</em> when you run your codes
@@ -371,6 +372,8 @@ <h3 id="___sec5">Project 1 e): </h3>
371372

372373
<span style="color: #008000; font-weight: bold">END PROGRAM </span><span style="color: #008000">time</span>
373374
</pre></div>
375+
<p>
376+
Your results may depend on the granularity of the clock.
374377

375378
<h2 id="___sec6">Introduction to numerical projects </h2>
376379

@@ -396,11 +399,11 @@ <h2 id="___sec7">Format for electronic delivery of report and programs </h2>
396399
The preferred format for the report is a PDF file. You can also use DOC or postscript formats or as an ipython notebook file. As programming language we prefer that you choose between C/C++, Fortran2008 or Python. The following prescription should be followed when preparing the report:
397400

398401
<ul>
399-
<li> Use Devilry to hand in your projects, log in at <a href="http://devilry.ifi.uio.no" target="_blank"><tt>http://devilry.ifi.uio.no</tt></a> with your normal UiO username and password and choose either 'fys3150' or 'fys4150'. There you can load up the files within the deadline.</li>
400-
<li> Upload <b>only</b> the report file! For the source code file(s) you have developed please provide us with your link to your github domain. The report file should include all of your discussions and a list of the codes you have developed. Do not include library files which are available at the course homepage, unless you have made specific changes to them.</li>
402+
<li> Use <b>Canvas</b> to hand in your projects, log in at <a href="https://www.uio.no/english/services/it/education/canvas/" target="_blank"><tt>https://www.uio.no/english/services/it/education/canvas/</tt></a> with your normal UiO username and password.</li>
403+
<li> Upload <b>only</b> the report file! For the source code file(s) you have developed please provide us with your link to your github domain. The report file should include all of your discussions and a list of the codes you have developed. Do not include library files which are available at the course homepage, unless you have made specific changes to them. Alternatively, you can just upload the address to your GitHub or GitLab repository.</li>
401404
<li> In your git repository, please include a folder which contains selected results. These can be in the form of output from your code for a selected set of runs and input parameters.</li>
402405
<li> In this and all later projects, you should include tests (for example unit tests) of your code(s).</li>
403-
<li> Comments from us on your projects, approval or not, corrections to be made etc can be found under your Devilry domain and are only visible to you and the teachers of the course.</li>
406+
<li> Comments from us on your projects, approval or not, corrections to be made etc can be found under your <b>Canvas</b> domain and are only visible to you and the teachers of the course.</li>
404407
</ul>
405408

406409
Finally,
@@ -413,7 +416,7 @@ <h2 id="___sec7">Format for electronic delivery of report and programs </h2>
413416

414417

415418
<center style="font-size:80%">
416-
<!-- copyright --> &copy; 1999-2019, "Computational Physics I FYS3150/FYS4150":"http://www.uio.no/studier/emner/matnat/fys/FYS3150/index-eng.html". Released under CC Attribution-NonCommercial 4.0 license
419+
<!-- copyright --> &copy; 1999-2020, "Computational Physics I FYS3150/FYS4150":"http://www.uio.no/studier/emner/matnat/fys/FYS3150/index-eng.html". Released under CC Attribution-NonCommercial 4.0 license
417420
</center>
418421

419422

-20 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)