Merge branch 'main' of github.com:amusecode/amusecode.github.io

_config.yml

@@ -15,5 +15,7 @@ aux_links:
         - "https://amuse.readthedocs.io/en/latest/"
     "Installation":
         - "https://amuse.readthedocs.io/en/latest/install/howto-install-AMUSE.html"
+    "Wiki for sysadmins":
+        - "https://github.com/amusecode/amuse/wiki"
     "FAQ":
         - "https://github.com/amusecode/amuse/discussions/categories/faq"

about.md

@@ -6,4 +6,4 @@ permalink: /about
 ---
 AMUSE is the Astrophysical Multipurpose Software Environment.
 
-Past and current contributors to AMUSE can be found in the [CITATION.cff](https://raw.githubusercontent.com/amusecode/amuse/master/CITATION.cff) file. We may have missed contributors here - please let us know if you find yourself or someone else is missing from this list.
+Past and current contributors to AMUSE can be found in the [CITATION.cff](https://raw.githubusercontent.com/amusecode/amuse/main/CITATION.cff) file. We may have missed contributors here - please let us know if you find yourself or someone else is missing from this list.

contributing.md

@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Contributing
-nav_order: 7
+nav_order: 8
 permalink: /contributing
 ---
 AMUSE is a community effort, so we appreciate contributions. Please have a look at the [issues](https://github.com/amusecode/amuse/issues/) page to see if you can help out with fixing a bug, adding a feature or something else. Or, if you need help, feel free to create a new issue there. In particular, we appreciate contributions to [these issues](https://github.com/amusecode/amuse/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22).

copyright.md

@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Copyright and citation
-nav_order: 8
+nav_order: 9
 permalink: /copyright
 ---
 

events.md

@@ -0,0 +1,24 @@
+---
+layout: default
+title: Events and meetings
+nav_order: 3
+permalink: /events
+---
+
+## Online user meetings
+
+We organise biweekly user meetings, alternating between Friday afternoon and Friday mornings (European time).
+The user meetings are open to all AMUSE users, from beginners to experts.
+They are an excellent opportunity to ask us anything you wanted to know about AMUSE, from installation issues to advanced bridging methods.
+
+These meetings and other AMUSE related events are announced on Github: [https://github.com/amusecode/amuse/discussions/categories/events](https://github.com/amusecode/amuse/discussions/categories/events)
+
+## In-person meetings
+
+We (irregularly) organise in-person meetings, either in the form of a workshop or as a school.
+These are organised at varying levels, with aims of teaching how to use AMUSE, contributing to AMUSE or usually a combination.
+
+### Recent meetings:
+- [April 2024](http://amusecode.org/workshopnyc): MODEST-24a at the AMNH in New York, USA
+- June 2022: AMUSE school at University of Geneva, Switzerland
+- December 2019: AMUSE school at Strasbourg University, France

gallery.md

@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Gallery
-nav_order: 5
+nav_order: 6
 permalink: /gallery
 ---
 

getting-started.md

@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Getting started
-nav_order: 4
+nav_order: 5
 permalink: /getting-started
 ---
 

papers.md

@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Papers   
-nav_order: 6
+nav_order: 7
 permalink: /papers
 ---
 

workshopnyc.md

@@ -0,0 +1,56 @@
+---
+layout: page
+permalink: /workshopnyc
+---
+
+We are organizing an advanced workshop for AMUSE users at the American Museum of Natural History in New York City. 
+The meeting will be from Monday, April 22 to Friday, April 26, starting on Monday at 10am at the AMNH.
+It will be held as an "unconference"/hackathon, as such there are no fixed slots for talks.
+
+~As available places are limited, please let us know as soon as possible whether you will be able to participate.
+Preference will be given to participants for whom travelling imposes a smaller carbon footprint.~
+
+We plan to organize a similar meeting later this year in Europe.
+
+Preliminary schedule:
+
+Monday:
+- Morning: Discuss what needs to be done.
+- Afternoon: Break-out sessions on following topics:
+  - Community building
+  - Software sustainability and maintenance
+	- Data repositories and FAIR
+	- Code styles and contributions by external members
+	- Expanding functionality (Code-tunneling data protocol, GPU support)
+	- Incorporating new codes (RAMSES, Binary-C, Arepo, Exo-Speedy, GENEC, KROME)
+	- Including new domains (atmospheric science and chemistry)
+
+Tuesday:
+- Morning: Work on the selected parts from day 1.
+- Afternoon: Break-out sessions: discussing new features
+
+Wednesday:
+- Morning: Refactor FLASH interface in AMUSE.
+- Afternoon: Break-out sessions: Discuss other MHD solver options.
+
+Thursday: 
+- Morning: Work on the selected parts from day 1.
+- Afternoon: Join the RAMSES workshop at the CCA Simons Center.
+
+Friday:
+- Morning: Design RAMSES interface for AMUSE
+- Afternoon: Conclusions and discussion of future developments
+
+LOC:
+   Mordecai-Mark Mac Low,
+   Sabrina Appel,
+   Eric Andersson,
+   Brooke Polak,
+   Adilkhan Assilkhan,
+   Steve McMillan
+
+SOC:
+   Steven Rieder,
+   Simon Portegies Zwart,
+   Mordecai-Mark Mac Low,
+   Steve McMillan