Merge branch 'master' of github.com:EnvModellingGroup/EnvModellingGroup.github.io

Author: jhill1

coc.html

@@ -14,15 +14,19 @@ <h2>Code of Conduct</h2>
 	<section class="wrapper style2">
 		<div class="container">
       <p>We value the participation of every member of our community and want to ensure an that every contributor has an 
-	 enjoyable and fulfilling experience. Accordingly, everyone who participates in any Hill Environmental Modelling
-	 Lab project is expected to show respect and courtesy to other community members at all time. We create our
+	 enjoyable and fulfilling experience. Accordingly, everyone who participates in any Environmental Modelling
+	 Group project is expected to show respect and courtesy to other community members at all time. We create our
 	 culture and our culture is inclusive.<p>
+			
+      <p>All research carried out at the University of York should conform to the 
+	 <a href="https://www.york.ac.uk/staff/research/governance/research-policies/research-code/">University's 
+		 Code of Practice</a>, including obtaining ethical permission <i>before</i> research commences.</p>
 
       <h3>Outputs and open science</h3>
 
       <p>Where possible all outputs will be published as Open Access (preferably Gold or Diamond OA) and the submitted 
       manuscript be posted on a pre-print server (e.g. <a href="https://eartharxiv.org/">EarthArXiv</a>) prior to 
-      publication. Where Gold OA is not possible, the manuscript should be made available
+      submission. Where Gold OA is not possible, the manuscript should be made available
       via Green OA and must be placed in the University of York's PURE system within three months of acceptance.</p>
 
       <p>Authorship on any work will be openly discussed in lab meetings and should include everyone who 
@@ -52,9 +56,9 @@ <h3>Flexible working hours</h3>
       between the hours of 10am and 4pm most days to facilitate collaborative working. Meetings and events will not be 
       arranged outside these hours. Exceptions for these core hours can be arranged in line with University and Departmental policy.</p>
 
-      <p>Avoid sending work-related email outside of 08:00 and 18:00. Use services like <a 
-      href="https://www.boomeranggmail.com/">Boomerang</a> or simply write the email     
-      and save as a draft, then send in the morning. Please give consideration to the 
+      <p>Avoid sending work-related email outside of 08:00 and 18:00. The University Google Mail comes with "scheduled emails"
+      to facilitate this and most email clients have the same capability (in-built or via add-ons) 
+      or simply write the email and save as a draft, then send later. Please give consideration to the 
       timing of the email with respect to what the recipient needs
       to do, i.e. don't send an email at 17:59 which is needed for a 10:00 meeting the next day. 
       Automated emails, e.g. pull requests, github review request, etc. are fine at any time, but no lab members are 
@@ -67,7 +71,7 @@ <h3>Flexible working hours</h3>
       <h3>Inclusivity and diversity</h3>
 
       <p>Jon Hill as head of the Lab, and all lab members, are dedicated to a harassment-free experience for everyone, regardless 
-      of gender, gender identity and expression, sexual orientation, disability, physical appearance, race, age or 
+      of sex, gender identity and expression, sexual orientation, disability, physical appearance, race, age or 
       religion. We do not tolerate harassment by and/or of members of our community in any form.</p>
 
       <p>To make clear what is expected, we ask all members of the community to conform to the following Code of Conduct.</p>
@@ -76,15 +80,14 @@ <h3>Inclusivity and diversity</h3>
       different backgrounds. Sexual language and imagery is not appropriate at any time.</li>
       <li>Be kind to others. Do not insult or put down other contributors.</li>
       <li>Behave professionally. Remember that harassment and sexist, racist, or exclusionary jokes are not appropriate.</li>
-      <li>Harassment includes offensive verbal comments related to gender, sexual orientation, disability, physical appearance, 
+      <li>Harassment includes offensive verbal comments related to sex, gender, sexual orientation, disability, physical appearance, 
       race, religion, sexual images in public spaces, deliberate intimidation, stalking, following, harassing 
       photography or recording, sustained disruption of discussions, inappropriate physical contact, and unwelcome sexual 
       attention.</li>
       <li>Participants asked to stop any harassing behaviour are expected to comply immediately.</li>
       </ul>
 
-      <p>Jon will discuss the conduct of lab members who violate these rules - no matter how much they have contributed to the 
-      Hill Environmental Modelling lab, or how specialised their skill set. 
+      <p>Jon will discuss the conduct of lab members who violate these rules - no matter how much they have contributed to EMRG, or how specialised their skill set. 
       If inappropriate behaviour persists after a discussion with Jon, formal processes in line with the
       University of York's procedures will commence.</p>
 

index.html

@@ -9,8 +9,18 @@
     <div class="container">
         <section>
             <h2>What do we do?</h2>
-            <p>The Hill <a href="people/">Environmental Modelling Research Group<a/> focuses on using the latest numerical technologies and data to solve environmental problems. As a group we look at natural hazards, such coastal and river flooding, and tsunamis, as well as oceanographic processes such as tides. We study these in the geological past, present and future. See our <a href="publications/">publication</a> for more details.</p>
-
+            <p>The Environmental Modelling Research Group, led by <a href="https://jonxhill.wordpress.com/">Jon Hill</a>, focuses on using the latest numerical technologies 
+		    and data to solve environmental problems. As a group we look at natural hazards, such coastal flooding and tsunamis, 
+		    as well as sedimentological processes and oceanographic processes, including tides. 
+		    We study these in the geological past, present and future. See our <a href="publications/">publications</a> for more details.</p>
+	    <div class="row">
+	<!--<section>
+           <h2>PhD Projects</h2>	
+		<p>We currently have a fully-funded PhD position via the <a href="https://accedtp.ac.uk/">ACCE DTP</a>. Deadline for applications is 13th Jan 2023. For more details see <a href="https://www.findaphd.com/phds/project/fully-funded-acce-environment-project-trees-vs-tsunamis/?p148523">FindAPhD.com</a></p>
+        </section>-->
+		
+        <section>
+	    </div>
             <div class="row">
 				   <div class="6u">
                   <p>
@@ -36,6 +46,7 @@ <h2>What do we do?</h2>
 	<section id="software" class="wrapper style2">
 		<div class="container">
 		   <h2>Software Used</h2>
+	   <p>We make use of a wide range of software, some of which is developed by us, with our collaborators, or is freely available. We try to use open-source software wherever we can.</p>
            <h3>Fluidity</h3>
            <p>Fluidity is used in a number of different scientific areas including geophysical fluid dynamics, computational fluid dynamics, ocean modelling and mantle convection. It uses a finite element/control volume method which allows arbitrary movement of the mesh with time dependent problems, allowing mesh resolution to increase or decrease locally according to the current simulated state. It has a wide range of element choices including mixed formulations. There is a lot more information on the <a href="http://fluidityproject.github.io/">Fluidity website.</a> Fluidity is available <a href="https://github.com/FluidityProject/fluidity">here.</a></p>
 
@@ -45,7 +56,10 @@ <h3>qmesh</h3>
             <h3>Thetis</h3>
             <p><a href="http://thetisproject.org/">Thetis</a> is a new modelling tool which like Fluidity is very flexible. Rather than code in C or Fortran, Thetis is written in a very high level <a href="http://www.firedrakeproject.org/"</a>Python abstraction called Firedrake</a> making use of mathematical terms like <i>grad</i> in the code itself. This high level code can then be compiled for a targetted platform.</p>
 
-           <h3>Supertree Toolkit</h3>
+	   <h3>Carst</h3>
+	<p><a href="https://carst-model.github.io/">Carst</a> is a new stratigraphic model that incorporates adjoint solver to invert the model. Very much under development and like Thetis, is based on <a href="http://www.firedrakeproject.org/"</a>Python abstraction called Firedrake</a>.
+	   
+	   <h3>Supertree Toolkit</h3>
            <p><a href="https://github.com/supertree-toolkit/stk">Supertree Toolkit</a> is a data processing pipeline for Supertree construction. It has been used in a number of publications which carry out macro-evolutionary studies using some of the largest supertrees ever constructed. More information is <a href="http://supertreetoolkit.org/">here.</a></p>
 
             <h3>R</h3>
@@ -58,15 +72,14 @@ <h3>Python</h3>
 	</section>
 
 	<div class="container">
-        
-        <section>
+
            <h2>Collaborators</h2>
            <p>Our group works with a number of collaborators across the globe, including at Imperial College London, University of Sydney, University of Bristol. We also work with collaborators in the University of York's Biology and Electronic Engineering departments.</p>
         </section>
 
         <section>
            <h2>Contact</h2>
-		<p>Please contact <a href="mailto:jonhill@york.ac.uk">Jon Hill</a></p>
+		<p>Please contact <a href="mailto:jon.hill@york.ac.uk">Jon Hill</a></p>
         </section>
     </div>