Merged with

ACCESS-NRI · Apr 21, 2024 · c722167 · c722167
2 parents e5552a5 + 73b084e
commit c722167
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 8 deletions.
diff --git a/docs/about/index.md b/docs/about/index.md
@@ -19,7 +19,7 @@
         </div>
         <div class="card-text-container bold">How to contribute</div>
     </a>
-    <a href="license" class="vertical-card aspect-ratio1to1">
+    <a href="License" class="vertical-card aspect-ratio1to1">
         <div class="card-image-container" style="container-type:size;">
             <div class="icon-cc white-background" style="font-size: 85cqh; color: black; height: 100%; width: 100%; display: flex; justify-content: center; align-items: center; border-radius: 0.35rem;"></div>
         </div>

diff --git a/docs/assets/assets_for_readme/tabs.gif b/docs/assets/assets_for_readme/tabs.gif
diff --git a/docs/assets/assets_for_readme/warning_note.png b/docs/assets/assets_for_readme/warning_note.png
diff --git a/docs/getting_started/first_steps.md b/docs/getting_started/first_steps.md
@@ -53,12 +53,17 @@ Before you login to <i>Gadi</i>, you need to possess the following prerequisites
 <ul>
   <li><b>Internet connection</b></li>
   <li>
-    <b>UNIX-like terminal</b>
+    <b>Terminal with built-in SSH</b>
     <br>
-    Linux and MacOS operative systems already have a built-in UNIX-like terminal.
+    Linux, MacOS and Windows 10 (or later) operative systems already have a terminal with built-in SSH.
     <br>
+<<<<<<< HEAD
     Windows users can install <a href="https://learn.microsoft.com/en-us/windows/wsl" target="_blank">Windows Subsystems for Linux (WSL)</a>. 
     <div class='admonition warning'>
+=======
+    Users of Windows 9 (or earlier) can install <a href="https://learn.microsoft.com/en-us/windows/wsl" target="_blank">Windows Subsystems for Linux (WSL)</a>. 
+    <div class="note">
+>>>>>>> development
       Alternatively, you can login through the <a href="https://are.nci.org.au/pun/sys/shell/ssh/gadi.nci.org.au" target="_blank">ARE Gadi Terminal</a>. 
       <br>
       However, it is recommended that you connect to <i>Gadi</i> from your local machine's terminal without using ARE. 
@@ -81,7 +86,7 @@ You will be prompted to enter your NCI password, and then you will be connected
 <terminal-line>#&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;- Obtain access to data without permission;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&emsp;#</terminal-line>
 <terminal-line>#&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;- Damage, delete, alter or insert data without permission;&emsp;&nbsp;#</terminal-line>
 <terminal-line>#&emsp;&emsp;&emsp;&emsp;Use of this system requires acceptance of the Conditions of Use;&emsp;&emsp;&emsp;&emsp;#</terminal-line>
-<terminal-line>#&emsp;&emsp;&emsp;&emsp;published at http://nci.org.au/users/nci-terms-and-conditions-access;&emsp;#</terminal-line>
+<terminal-line>#&emsp;&emsp;&emsp;&emsp;published at https://nci.org.au/users/nci-terms-and-conditions-access;&emsp;#</terminal-line>
 <terminal-line>###############################################################################</terminal-line>
 <terminal-line>|&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;gadi.nci.org.au - 260,760 processor InfiniBand x86_64 cluster&emsp;&emsp;&nbsp;&nbsp;&nbsp;|</terminal-line>
 <terminal-line>===============================================================================</terminal-line>
@@ -257,7 +262,7 @@ For example, if you want to change your default project to `tm70` on <i>Gadi</i>
 <terminal-line lineDelay=0>#&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;- Obtain access to data without permission;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&emsp;#</terminal-line>
 <terminal-line lineDelay=0>#&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;- Damage, delete, alter or insert data without permission;&emsp;&nbsp;#</terminal-line>
 <terminal-line lineDelay=0>#&emsp;&emsp;&emsp;&emsp;Use of this system requires acceptance of the Conditions of Use;&emsp;&emsp;&emsp;&emsp;#</terminal-line>
-<terminal-line lineDelay=0>#&emsp;&emsp;&emsp;&emsp;published at http://nci.org.au/users/nci-terms-and-conditions-access;&emsp;#</terminal-line>
+<terminal-line lineDelay=0>#&emsp;&emsp;&emsp;&emsp;published at https://nci.org.au/users/nci-terms-and-conditions-access;&emsp;#</terminal-line>
 <terminal-line lineDelay=0>###############################################################################</terminal-line>
 <terminal-line lineDelay=0>|&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;gadi.nci.org.au - 260,760 processor InfiniBand x86_64 cluster&emsp;&emsp;&nbsp;&nbsp;&nbsp;|</terminal-line>
 <terminal-line lineDelay=0>===============================================================================</terminal-line>

diff --git a/...l_evaluation/model_evaluation_on_gadi/model_evaluation_on_gadi_pangeo_cosima.md b/...l_evaluation/model_evaluation_on_gadi/model_evaluation_on_gadi_pangeo_cosima.md
@@ -8,7 +8,7 @@ COSIMA is the Consortium for Ocean-Sea Ice Modelling in Australia, which brings
     The <i>COSIMA Cookbook</i> is developed and maintained by COSIMA. While ACCESS-NRI does not own the code, it actively supports the use of the <i>COSIMA Cookbook</i> and its collection of `cosima-recipes` on <i>Gadi</i>. 
     ACCESS-NRI provides access to the latest version of <i>COSIMA Cookbook</i> via the `hh5` `access-med` <a href="\model_evaluation/model_evaluation_getting_started/model_evaluation_getting_started">conda environment for Model Evaluation on Gadi</a>.
 
- The <i>COSIMA Cookbook</i> framework focuses on the [ACCESS-OM2](../../models/configurations/access-om.md) suite of models being developed and run by members of <a href="http://cosima.org.au/" target="_blank">COSIMA</a>. Nevertheless, this framework is suited to analysing any MOM5/ MOM6 output as well as output from other models.
+ The <i>COSIMA Cookbook</i> framework focuses on the <a href="/models/configurations/access-om">ACCESS-OM2</a> suite of models being developed and run by members of <a href="http://cosima.org.au/" target="_blank">COSIMA</a>. Nevertheless, this framework is suited to analysing any MOM5/ MOM6 output as well as output from other models.
 
 ## Getting Started
 

diff --git a/docs/models/configurations/access-om.md b/docs/models/configurations/access-om.md
@@ -14,7 +14,6 @@ The atmospheric fields that drive the model are provided by a data source, usual
 The ACCESS-OM2 has versions at three different spatial resolutions: <a href="http://cosima.org.au/index.php/models/access-om2/" target="_blank">ACCESS-OM2</a>, <a href="http://cosima.org.au/index.php/models/access-om2-025/" target="_blank">ACCESS-OM2-025</a> and <a href="http://cosima.org.au/index.php/models/access-om2-01-2/" target="_blank">ACCESS-OM2-01</a>.
 
 ### Model Components
-
 <!-- Tab labels -->
 <div class="tabLabels" label="ACCESS-OM-versions">
     <button>ACCESS-OM2</button>

diff --git a/docs/models/run-a-model/run-access-cm.md b/docs/models/run-a-model/run-access-cm.md
@@ -11,7 +11,7 @@
 ### General prerequisites
 Before running {{ model }}, you need to fulfil general prerequisites outlined in the <a href="/getting_started/first_steps">First Steps</a> section.
 
-If you are unsure whether {{ model }} is the right choice for your experiment, take a look at the overview of [ACCESS Models](/models).
+If you are unsure whether {{ model }} is the right choice for your experiment, take a look at the overview of <a href="/models">ACCESS Models</a>.
 
 ### Model-specific prerequisites
 <ul>

diff --git a/drafts/configurations/access-am.md b/drafts/configurations/access-am.md
@@ -0,0 +1,35 @@
+#  ACCESS-AM  
+
+
+<img src="../../../assets/model-config-logos/configurations-without-titles/access-am.png" alt="ACCESS AM model" class="white-background with-border with-padding"></img>
+
+The ACCESS Atmosphere Model (ACCESS-AM) is a global model with atmosphere and land surface components. It is often used in Atmospheric Model Intercomparison Project (AMIP) experiments where it is driven by historically observed sea surface temperature and sea ice data.
+
+ACCESS-NRI will release supported ACCESS-AM configurations.  The first release, ACCESS-AM2, will be derived from the [CSIRO ACCESS-CM2 configuration](./access-cm.md#access-cm2) and will include [atmosphere] and [land] components.
+
+## ACCESS-AM2
+
+This is the model configuration used for the AMIP experiments contributed to the World Climate Research Programme’s Coupled Model Intercomparison Project Phase 6 (CMIP6). Note that the CMIP model naming is the same for both the AM and CM configurations, so the CMIP6 experiments are ACCESS-CM2 AMIP rather than ACCESS-AM2.
+
+The component models are the same as ACCESS-CM2:
+
+- Atmosphere model (UM vn10.6, GA7.1 science configuration): N96 resolution (1.875° x 1.25°, 85 levels). Physical model only – no carbon cycle.
+
+- Land surface model (CABLE2.5)
+
+[**Citation** [@Bi2020]][ACCESS-CM2-cite]
+
+### Other configurations
+
+Some experiments already run with other atmospheric model configurations  are listed at:
+
+ - [CLEX CMS wiki][UMexperiments]
+
+[atmosphere]: ../model_components/atmosphere.md
+[land]: ../model_components/land.md
+[UM-hive]: ../model_components/atmosphere.md#the-unified-model
+[JULES-hive]: ../model_components/land.md#jules
+[CABLE-hive]: ../model_components/land.md#cable
+[UMstart]: http://climate-cms.wikis.unsw.edu.au/Unified_Model
+[UMexperiments]: http://climate-cms.wikis.unsw.edu.au/UM_Experiments
+[ACCESS-CM2-cite]: https://www.publish.csiro.au/es/ES19040