Merge pull request #233 from Morpho-lang/dev

Merge 0.5.7 into main

README.md

@@ -114,23 +114,25 @@ morpho5
 
 Note that the build script places morpho5 and morphoview in the `/usr/local` file structure; this can easily be changed if a different location is preferred. See the manual for details. 
 
-### Windows via Windows Subsystem for Linux (WSL)
+### Windows via Windows Subsystem for Linux (WSL2)
 
-#### Install WSL
+#### Install WSL2
 
-The instructions to install the Ubuntu App are [here](https://ubuntu.com/tutorials/ubuntu-on-windows#1-overview).
+If you don't have WSL2 installed on your Windows computer, follow the instructions to install the Ubuntu App [here](https://ubuntu.com/tutorials/install-ubuntu-on-wsl2-on-windows-11-with-gui-support#1-overview). Follow all the steps in this link to ensure that graphics are working. 
 
-Once the Ubuntu terminal is working in Windows, you can install Morpho through it in almost the same way as a Linux system, with the addition of an X windows manager to handle visualizations.
+#### Install Morpho
 
-Unless mentioned otherwise, all the commands below are run in the Ubuntu terminal.
+Once the Ubuntu terminal is working in Windows, you can install Morpho the same way as in Linux by running the commands in the [instructions](#unix-and-linux) in the Ubuntu terminal.
 
-#### Install Morpho
+If you are using WSL2, then the installation is complete.
 
-Follow the instructions for the linux install above. 
+#### Graphics On WSL1
 
-#### Get visualization working in WSL
+If you instead are working on WSL1, then you need to follow these instructions to get graphics running.
+
+Unless mentioned otherwise, all the commands below are run in the Ubuntu terminal.
 
-Now a window manager must be installed so that the WSL can create windows.
+A window manager must be installed so that the WSL1 can create windows.
 
 1\. On Windows, install [VcXsrv](https://sourceforge.net/projects/vcxsrv/).
 

devguide/devguide.lyx

@@ -166,7 +166,7 @@ Developer Guide
 \begin_inset Newline newline
 \end_inset
 
-Version 0.5.6
+Version 0.5.7
 \end_layout
 
 \begin_layout Standard

examples/examples.py

@@ -86,7 +86,7 @@ def run(file,testLog,CI):
 
             if (iserror(line)):
                 if not CI:
-                    print(stylize("Failed",colored.fg("red")))
+                    print("Failed") #stylize("Failed",colored.fg("red"))) // Temporarily disable this 6/19/23 due to colored module API change
                 else:
                     print("::error file = {",file,"}::{",file," Failed}")
 
@@ -101,7 +101,7 @@ def run(file,testLog,CI):
         if (ret ==1):
             if not CI:
                 print(file+":", end=" ")
-                print(stylize("Passed",colored.fg("green")))
+                print("Passed") #stylize("Passed",colored.fg("green")))
         # Delete the temporary file
         os.system('rm ' + tmp)
     return ret

manual/src/Reference/functionals.tex

@@ -97,11 +97,16 @@ \subsection{ScalarPotential}\label{scalarpotential}}
 The \texttt{ScalarPotential} functional is applied to point elements.
 
 \begin{lstlisting}
-var ls = ScalarPotential(potential, gradient)
+var ls = ScalarPotential(potential)
 \end{lstlisting}
 
-You must supply two functions (which may be anonymous) that return the
-potential and gradient respectively.
+You must supply a function (which may be anonymous) that returns the
+potential. You may optionally provide a function that returns the
+gradient as well at initialization:
+
+\begin{lstlisting}
+var ls = ScalarPotential(potential, gradient)
+\end{lstlisting}
 
 This functional is often used to constrain the mesh to the level set of
 a function. For example, to confine a set of points to a sphere:

manual/src/Reference/matrix.tex

@@ -116,6 +116,17 @@ \subsection{Inner}\label{inner}}
 var prod = A.inner(B)
 \end{lstlisting}
 
+\hypertarget{outer}{%
+\subsection{Outer}\label{outer}}
+
+Computes the outer produce between two vectors:
+
+\begin{lstlisting}
+var prod = A.outer(B)
+\end{lstlisting}
+
+Note that \texttt{outer} always treats both vectors as column vectors.
+
 \hypertarget{inverse}{%
 \subsection{Inverse}\label{inverse}}
 
@@ -190,3 +201,24 @@ \subsection{Trace}\label{trace}}
 \begin{lstlisting}
 var tr = A.trace()
 \end{lstlisting}
+
+\hypertarget{roll}{%
+\subsection{Roll}\label{roll}}
+
+Rotates values in a Matrix about a given axis by a given shift:
+
+\begin{lstlisting}
+var r = A.roll(shift, axis)
+\end{lstlisting}
+
+Elements that roll beyond the last position are re-introduced at the
+first.
+
+\hypertarget{identitymatrix}{%
+\subsection{IdentityMatrix}\label{identitymatrix}}
+
+Constructs an identity matrix of a specified size:
+
+\begin{lstlisting}
+var a = IdentityMatrix(size)
+\end{lstlisting}

manual/src/Reference/system.tex

@@ -4,21 +4,84 @@ \section{System}\label{system}}
 The \texttt{System} class provides information and access to some
 features of the runtime environment.
 
+\hypertarget{platform}{%
+\subsection{Platform}\label{platform}}
+
 Detect which platform morpho was compiled for:
 
 \begin{lstlisting}
 print System.platform() 
 \end{lstlisting}
 
-which could return \texttt{macos}, \texttt{linux}, \texttt{unix} or
-\texttt{windows}.
+which returns \texttt{"macos"}, \texttt{"linux"}, \texttt{"unix"} or
+\texttt{"windows"}.
+
+\hypertarget{version}{%
+\subsection{Version}\label{version}}
 
 Find the current version of morpho:
 
 \begin{lstlisting}
 print System.version() 
 \end{lstlisting}
 
+\hypertarget{clock}{%
+\subsection{Clock}\label{clock}}
+
+Returns the system time in seconds, with at least millisecond
+granularity. Primarily intended for timing:
+
+\begin{lstlisting}
+var start=System.clock() 
+// Do something 
+print System.clock()-start 
+\end{lstlisting}
+
+Note that \texttt{System.clock} measures the actual physical time
+elapsed, not the time spent in a process.
+
+\hypertarget{sleep}{%
+\subsection{Sleep}\label{sleep}}
+
+Pauses the program for a specified number of seconds:
+
+\begin{lstlisting}
+System.sleep(0.5) // Sleep for half a second
+\end{lstlisting}
+
+\hypertarget{readline}{%
+\subsection{Readline}\label{readline}}
+
+Reads a line of input from the console:
+
+\begin{lstlisting}
+var in = System.readline() 
+\end{lstlisting}
+
+\hypertarget{arguments}{%
+\subsection{Arguments}\label{arguments}}
+
+Returns a \texttt{List} of arguments passed to the current morpho on the
+command line.
+
+\begin{lstlisting}
+var args = System.arguments() 
+for (e in args) print e 
+\end{lstlisting}
+
+Run a morpho program with arguments:
+
+\begin{lstlisting}
+morpho5 program.morpho hello world
+\end{lstlisting}
+
+Note that, in line with UNIX conventions, command line arguments before
+the program file name are passed to the \texttt{morpho5} runtime; those
+after are passed to the morpho program via \texttt{System.arguments}.
+
+\hypertarget{exit}{%
+\subsection{Exit}\label{exit}}
+
 Stop execution of a program:
 
 \begin{lstlisting}