Skip to content

Commit 0b4447d

Browse files
authored
Merge pull request #254 from NOAA-GFDL/fix/remove-yct-contact-info
Update documentation to include latest contact info and data sources
2 parents cbc6f2e + f9611f2 commit 0b4447d

7 files changed

Lines changed: 47 additions & 46 deletions

File tree

diagnostics/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# diagnostics
22
This folder provides scripts, that can be utilized for analyzing model results.
3-
Please contact the code manager Yi-Cheng Teng (Contact: yi-cheng.teng@noaa.gov) if you have any queations.
3+
Please contact us at oar.gfdl.cefi-support AT noaa DOT gov if you have any queations.
44

55
## Prerequisite
66
The majority of the scripts are written in Python. One can follow the instructions (README.md under tools folder) to create a Python virtual environment on NOAA R&D HPCs or GFDL Analysis.
77

8-
The Python scripts that read model data are written to take advantage of the `hsmget` command for faster reading and caching of data from the archive filesystem. When using GFDL Analysis, it is recommended to load the hsm module (`module load hsm/1.3.0`) before running any of the diagnostic scripts.
8+
The Python scripts that read model data are written to take advantage of the `hsmget` command for faster reading and caching of data from the archive filesystem. When using GFDL Analysis, it is recommended to load the hsm module (`module load hsm/1.3.0`) before running any of the diagnostic scripts.

docs/source/BuildMOM6.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To build the MOM6-SIS2-COBALT, users will complete the following steps:
1212

1313
.. _StackInfo:
1414

15-
Install the Prerequisite Softwares
15+
Install the Prerequisite Softwares
1616
==========================================
1717

1818
.. note::
@@ -23,7 +23,7 @@ Users on any sufficiently up-to-date machine with a UNIX-based operating system
2323

2424
.. code-block:: console
2525
26-
# Linux system such as Ubuntu
26+
# Linux system such as Ubuntu
2727
sudo apt update
2828
sudo apt install make gfortran git git-lfs tcsh netcdf-bin libnetcdf-dev libnetcdff-dev openmpi-bin libopenmpi-dev
2929
@@ -40,7 +40,7 @@ Users on any sufficiently up-to-date machine with a UNIX-based operating system
4040
4141
For **Windows users**, we recommend installing `WSL <https://learn.microsoft.com/en-us/windows/wsl/install>`__ (Windows Subsystem for Ubuntu and Linux), and following the above steps to install the prerequisite software. Alternatively users can opt for the Docker container approach. See :ref:`Container-Based Quick Start Guide <QuickstartC>` for more details.
4242

43-
After completing installation, continue to the :ref:`next section <DownloadMOM6>` to download the CEFI-regional-MOM6.
43+
After completing installation, continue to the :ref:`next section <DownloadMOM6>` to download the CEFI-regional-MOM6.
4444

4545
.. _DownloadMOM6:
4646

@@ -50,9 +50,9 @@ The CEFI-regional-MOM6 source code is publicly available on GitHub. To download
5050

5151
.. code-block:: console
5252
53-
git clone https://github.com/NOAA-GFDL/CEFI-regional-MOM6.git --recursive
53+
git clone https://github.com/NOAA-GFDL/CEFI-regional-MOM6.git --recursive
5454
55-
The cloned repository contains files and sub-directories shown in :numref:`Table %s <FilesAndSubDirs>`.
55+
The cloned repository contains files and sub-directories shown in :numref:`Table %s <FilesAndSubDirs>`.
5656

5757
.. _FilesAndSubDirs:
5858

@@ -62,12 +62,12 @@ The cloned repository contains files and sub-directories shown in :numref:`Table
6262

6363
* - File/Directory Name
6464
- Description
65-
* - LICENSE.md
65+
* - LICENSE.md
6666
- A copy of the Gnu lesser general public license, version 3
6767
* - README.md
6868
- This file with basic pointers to more information
6969
* - src
70-
- Contains the source code for MOM6-SIS2-COBALT model
70+
- Contains the source code for MOM6-SIS2-COBALT model
7171
* - builds
7272
- Contains build script to build MOM6-SIS2-COBALT
7373
* - diagnostics
@@ -77,14 +77,14 @@ The cloned repository contains files and sub-directories shown in :numref:`Table
7777
* - tools
7878
- Contains preprocessing scripts that can be used to generate model input files
7979
* - xmls
80-
- Contains FRE xml files designed for running the CEFI-regional-MOM6 workflow on Gaea
80+
- Contains FRE xml files designed for running the CEFI-regional-MOM6 workflow on Gaea
8181
* - docs
8282
- Contains release notes, documentation, and User's Guide
8383

8484
.. _BuildExecutables:
8585

8686
Set Up the Environment and Build the Executables
87-
===================================================
87+
===================================================
8888

8989
After download the source code, users can navigate to the ``builds`` directory and create a folder for your machine configurations:
9090

@@ -112,19 +112,19 @@ The NAME_OF_YOUR_mk_FILE.mk file may be different depends on your system configu
112112
| Ubuntu (GNU) | mkmf/templates/linux-ubuntu-trusty-gnu.mk |
113113
+------------------------+---------------------------------------------------------------------------------+
114114

115-
Once the two files are created, use the following command to build the model (Make sure to use correct names that are consistent with both your machine folder and your mk/env files):
115+
Once the two files are created, use the following command to build the model (Make sure to use correct names that are consistent with both your machine folder and your mk/env files):
116116

117117
.. code-block:: console
118118
119119
cd CEFI-regional-MOM6/builds
120120
./linux-build.bash -m YOUR_MACHINE_DIRECTORY -p NAME_OF_YOUR_mk_FILE -t repro -f mom6sis2
121121
122-
If the build completes successfully, you should be able to find the executable here: ``builds/build/YOUR_MACHINE_DIRECTORY-NAME_OF_YOUR_mk_FILE/ocean_ice/repro/MOM6SIS2``
122+
If the build completes successfully, you should be able to find the executable here: ``builds/build/YOUR_MACHINE_DIRECTORY-NAME_OF_YOUR_mk_FILE/ocean_ice/repro/MOM6SIS2``
123123

124124
Run an Experiment
125125
=====================
126126

127-
To test your ``MOM6SIS2``, first navigate to the ``exps`` folder:
127+
To test your ``MOM6SIS2``, first navigate to the ``exps`` folder:
128128

129129
.. code-block:: console
130130
@@ -134,16 +134,16 @@ Download the model input files:
134134

135135
.. code-block:: console
136136
137-
wget ftp.gfdl.noaa.gov:/pub/Yi-cheng.Teng/1d_ci_datasets.tar.gz && tar -zxvf 1d_ci_datasets.tar.gz && rm -rf 1d_ci_datasets.tar.gz
137+
wget ftp://nomads.gfdl.noaa.gov/1/users/cefi/OM4.single_column.COBALT/data/1d_ci_datasets.tar.gz && tar -zxvf 1d_ci_datasets.tar.gz && rm -rf 1d_ci_datasets.tar.gz
138138
139139
Navigate to the 1-D example:
140140

141141
.. code-block:: console
142142
143143
cd OM4.single_column.COBALT
144144
145-
Use the following command to run the 1-D example:
145+
Use the following command to run the 1-D example:
146146

147147
.. code-block:: console
148-
148+
149149
mpirun -np 1 ../../builds/build/YOUR_MACHINE_DIRECTORY-NAME_OF_YOUR_mk_FILE/ocean_ice/repro/MOM6SIS2

docs/source/ContainerQuickstart.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
Container-Based Quick Start Guide
55
====================================
66

7-
This Container-Based Quick Start Guide will help users build and run the 1D case for the MOM6-SIS2-COBALT System using a `Singularity/Apptainer <https://apptainer.org/docs/user/1.2/introduction.html>`__ container. The :term:`container` approach provides a uniform enviroment in which to build and run the MOM6-SIS2-COBALT. Normally, the details of building and running the MOM6-COBALT vary from system to system due to the many possible combinations of operating systems, compilers, :term:`MPIs <MPI>`, and package versions available. Installation via container reduces this variability and allows for a smoother MOM6-SIS2-COBALT build experience.
7+
This Container-Based Quick Start Guide will help users build and run the 1D case for the MOM6-SIS2-COBALT System using a `Singularity/Apptainer <https://apptainer.org/docs/user/1.2/introduction.html>`__ container. The :term:`container` approach provides a uniform enviroment in which to build and run the MOM6-SIS2-COBALT. Normally, the details of building and running the MOM6-COBALT vary from system to system due to the many possible combinations of operating systems, compilers, :term:`MPIs <MPI>`, and package versions available. Installation via container reduces this variability and allows for a smoother MOM6-SIS2-COBALT build experience.
88

99
The basic "1D" case described here builds a MOM6-COBALT for the Bermuda Atlantic Time-series Study (BATS) with OM4 single column configuration as well as COBALTV3.0.
1010

11-
Prerequisites
11+
Prerequisites
1212
-------------------
1313

1414
Users must have either Docker (recommended for personal Windows/macOS systems) or Singularity/Apptainer (recommended for users working on Linux, NOAA Cloud, or HPC systems).
1515

1616
Install Docker on Windows/macOS
1717
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18-
To build and run the MOM6-SIS2-COBALT using a Docker container, first install the software according to the `Docker Installation Guide for Windows <https://docs.docker.com/desktop/install/windows-install/>`__ or `Docker Installation Guide for macOS <https://docs.docker.com/desktop/install/mac-install/>`__.
18+
To build and run the MOM6-SIS2-COBALT using a Docker container, first install the software according to the `Docker Installation Guide for Windows <https://docs.docker.com/desktop/install/windows-install/>`__ or `Docker Installation Guide for macOS <https://docs.docker.com/desktop/install/mac-install/>`__.
1919

2020
Install Singularity/Apptainer
2121
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -26,17 +26,17 @@ Install Singularity/Apptainer
2626

2727
To build and run the MOM6-COBALT using a Singularity/Apptainer container, first install the software according to the `Apptainer Installation Guide <https://apptainer.org/docs/admin/1.2/installation.html>`__. This will include the installation of all dependencies.
2828

29-
Build and run 1-D example using Docker
29+
Build and run 1-D example using Docker
3030
-----------------------------------------
3131
User can follow the following steps to build and run MOM6-SIS2-COBALT 1-D case within a Docker container.
3232

3333
.. code-block::
3434
35-
#Assume user is under $HOME
35+
#Assume user is under $HOME
3636
docker pull clouden90/1d_mom6_cobalt:base #This will pull docker image to your local machine
3737
git clone https://github.com/NOAA-GFDL/CEFI-regional-MOM6.git --recursive #git clone CEFI-regional-MOM6 repo
3838
cd $HOME/CEFI-regional-MOM6/exps
39-
wget ftp.gfdl.noaa.gov:/pub/Yi-cheng.Teng/1d_ci_datasets.tar.gz && tar -zxvf 1d_ci_datasets.tar.gz && rm -rf 1d_ci_datasets.tar.gz
39+
wget ftp://nomads.gfdl.noaa.gov/1/users/cefi/OM4.single_column.COBALT/data/1d_ci_datasets.tar.gz && tar -zxvf 1d_ci_datasets.tar.gz && rm -rf 1d_ci_datasets.tar.gz
4040
cd $HOME
4141
docker run --rm -v $HOME:/work -it clouden90/1d_mom6_cobalt:v0.1 bash --login # run docker container interactively
4242
cd /work/CEFI-regional-MOM6/builds
@@ -50,7 +50,7 @@ Build and run 1-D example using Singularity/Apptainer container
5050
-----------------------------------------
5151
For users working on systems with limited disk space in their ``/home`` directory, it is recommended to set the ``SINGULARITY_CACHEDIR`` and ``SINGULARITY_TMPDIR`` environment variables to point to a location with adequate disk space. For example:
5252

53-
.. code-block::
53+
.. code-block::
5454
5555
export SINGULARITY_CACHEDIR=/absolute/path/to/writable/directory/cache
5656
export SINGULARITY_TMPDIR=/absolute/path/to/writable/directory/tmp
@@ -60,13 +60,13 @@ where ``/absolute/path/to/writable/directory/`` refers to a writable directory (
6060
Then User can follow the following steps to build and run MOM6-SIS2-COBALT 1-D case within a Singularity/Apptainer container.
6161
.. code-block::
6262
63-
#Assume user is under $HOME
64-
cd $HOME
63+
#Assume user is under $HOME
64+
cd $HOME
6565
singularity pull 1d_mom6_cobalt.sif docker://clouden90/1d_mom6_cobalt:base #pull docker image and convert to sif
66-
git clone https://github.com/NOAA-GFDL/CEFI-regional-MOM6.git --recursive #git clone CEFI-regional-MOM6 repo
66+
git clone https://github.com/NOAA-GFDL/CEFI-regional-MOM6.git --recursive #git clone CEFI-regional-MOM6 repo
6767
cd $HOME/CEFI-regional-MOM6/exps
68-
wget ftp.gfdl.noaa.gov:/pub/Yi-cheng.Teng/1d_ci_datasets.tar.gz && tar -zxvf 1d_ci_datasets.tar.gz && rm -rf 1d_ci_datasets.tar.gz
69-
cd $HOME
68+
wget ftp://nomads.gfdl.noaa.gov/1/users/cefi/OM4.single_column.COBALT/data/1d_ci_datasets.tar.gz && tar -zxvf 1d_ci_datasets.tar.gz && rm -rf 1d_ci_datasets.tar.gz
69+
cd $HOME
7070
singularity shell -B $HOME:/work -e $HOME/1d_mom6_cobalt.sif # start singularity/apptainer container interactively
7171
cd /work/CEFI-regional-MOM6/builds
7272
./linux-build.bash -m docker -p linux-gnu -t repro -f mom6sis2 #build MOM6-SIS2-COBALT

docs/source/Diagnostics.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
Analysis output
55
====================================
66

7-
The ``CEFI-regional-MOM6/diagnostics`` folder contains python scripts that can be used to analyze modeled physical and biogeochemical results.
8-
Please contact the code manager `Yi-cheng.Teng <yi-cheng.teng@noaa.gov>`_ if you have any queations.
7+
The ``CEFI-regional-MOM6/diagnostics`` folder contains python scripts that can be used to analyze modeled physical and biogeochemical results.
8+
Please contact us at `oar.gfdl.cefi-support@noaa.gov`_ if you have any queations.
99

1010
.. note::
1111

@@ -43,7 +43,7 @@ The :numref:`Table %s <Diagsphytable>` below provides short descriptions for scr
4343

4444
* - File Name
4545
- Description
46-
* - sst_eval.py
46+
* - sst_eval.py
4747
- Compare model SST with 1993--2019 data from OISST and GLORYS
4848
* - sst_trends.py
4949
- Compare the model 2005-2019 SST trends from OISST and GLORYS
@@ -52,15 +52,15 @@ The :numref:`Table %s <Diagsphytable>` below provides short descriptions for scr
5252
* - ssh_eval.py
5353
- Compare model SSH with 1993--2019 data from GLORYS
5454
* - mld_eval.py
55-
- Compare model MLD with climatologies from Holte et al. 2017 and de Boyer 2022
55+
- Compare model MLD with climatologies from Holte et al. 2017 and de Boyer 2022
5656
* - compute_tides_job.sh
5757
- Compare modeled tidal amplitude and phase with TPXO9 data
5858
* - NWA12/coldpool.py
59-
- Compare bottom temperature from the model and du Pontavice et al.(2022) in the cold-pool region averaged over June-September
59+
- Compare bottom temperature from the model and du Pontavice et al.(2022) in the cold-pool region averaged over June-September
6060
* - NWA12/nechannel.py
6161
- Plot model-data comparison for Northeast Channel temperature and salinity
6262
* - NWA12/seaice.py
63-
- Compare monthly climatology of sea ice concentration from the model and a satellite observation dataset
63+
- Compare monthly climatology of sea ice concentration from the model and a satellite observation dataset
6464
* - NWA12/tbot_epu.py
6565
- Compare annual average bottom-temperature anomalies in four different northeast US ecological production units from model,
6666
reanalysis, and observed data
@@ -92,8 +92,8 @@ The :numref:`Table %s <Diagsbiogeotable>` below provides short descriptions for
9292
- Comparison of model seasonal mean surface phosphate and nitrate with the World Ocean Atlas data
9393
* - oa_metrics.py
9494
- Compare Mean surface alkalinity, dissolved inorganic carbon, and aragonite saturation statee between the model and the
95-
observation-derived climatology
95+
observation-derived climatology
9696
* - zooplankton.py
9797
- Compare the 0-200 m average mesozooplankton biomass climatology between model and Observations from the COPEPOD dataset
9898
* - NWA12/hypoxic_area.py
99-
- Compare monthly climatologies of hypoxic area over the LA-TX Shelf between the model and geostatistical estimates from Matli et al. (2020)
99+
- Compare monthly climatologies of hypoxic area over the LA-TX Shelf between the model and geostatistical estimates from Matli et al. (2020)

docs/source/RunNWA12.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,38 @@ Download the model input dataset
2121

2222
The dataset for the MOM6-COBALT-NWA12 (retrospective run from year 1993) is publicly available. Follow the steps below to download the dataset:
2323

24+
2425
.. code-block:: console
2526
2627
cd CEFI-regional-MOM6/exps
27-
wget ftp.gfdl.noaa.gov:/pub/Yi-cheng.Teng/nwa12_datasets.tar.gz
28+
wget ftp://nomads.gfdl.noaa.gov/1/users/cefi/OM4.single_column.COBALT/data/1d_ci_datasets.tar.gz
2829
tar -zxvf nwa12_datasets.tar.gz
2930
3031
This dataset contains all the necessary model input files (e.g. grid files, ICs, BCs, atmospheric forcings, river dischages, BGC fluxes from atmosphere). Most of these input files can be generated using the tools under ``CEFI-regional/MOM6/tools``. Please be aware that this dataset is quite large (51 GB), so please be patient while downloading it.
3132

3233
Users interested in the model inputs, outputs, and configurations should refer to :ref:`Data: Input, Model Configuration, and Output Files <InputsOutputs>`.
3334

34-
After downloading the dataset, continue to the :ref:`next section <RunNWA12EXP>` to run the NWA12 example.
35+
After downloading the dataset, continue to the :ref:`next section <RunNWA12EXP>` to run the NWA12 example.
3536

3637
.. _RunNWA12EXP:
3738

3839
Run NWA12 Experiment
3940
=====================
4041

41-
To run the NWA12 example, first navigate to the ``exps/NWA12.COBALT`` folder:
42+
To run the NWA12 example, first navigate to the ``exps/NWA12.COBALT`` folder:
4243

4344
.. code-block:: console
4445
4546
cd ../exps/NWA12.COBALT
4647
cp ./../builds/build/YOUR_MACHINE_DIRECTORY-NAME_OF_YOUR_mk_FILE/ocean_ice/repro/MOM6SIS2 .
4748
48-
Use the following command to run the NWA-12 example on Gaea using SLURM:
49+
Use the following command to run the NWA-12 example on Gaea using SLURM:
4950

5051
.. code-block:: console
5152
5253
sbatch run.sub
5354
54-
Users may need to modify the run script according to their HPC machine configurations. The default configuration uses 1646 CPU cores to run the NWA12 example. If users want to change it to their desired number of CPU cores (e.g., 20x20 = 400 cores), they can modify both ``MOM_layout`` and ``SIS_layout`` by removing the mask_table and editing the LAYOUT:
55+
Users may need to modify the run script according to their HPC machine configurations. The default configuration uses 1646 CPU cores to run the NWA12 example. If users want to change it to their desired number of CPU cores (e.g., 20x20 = 400 cores), they can modify both ``MOM_layout`` and ``SIS_layout`` by removing the mask_table and editing the LAYOUT:
5556

5657
.. code-block:: console
5758

docs/source/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
==============================================
77
Welcome to CEFI-regional-MOM6's documentation!
88
==============================================
9-
**CEFI-regional-MOM6** contains essential tools, XML files, and source codes for collaborators of the Climate, Ecosystems, and Fisheries Initiative (CEFI) to conduct ocean physical-biogeochemical simulations for climate-scale applications, including seasonal predictions (12 months), decadal predictions (10 years), and multi-decadal projections (to the end of the 21st century).
9+
**CEFI-regional-MOM6** contains essential tools, XML files, and source codes for collaborators of the Climate, Ecosystems, and Fisheries Initiative (CEFI) to conduct ocean physical-biogeochemical simulations for climate-scale applications, including seasonal predictions (12 months), decadal predictions (10 years), and multi-decadal projections (to the end of the 21st century).
1010

1111
=============
12-
Code managers
12+
Contact Info
1313
=============
1414

15-
* Yi-Cheng Teng - @yichengt900 / yi-cheng.teng@noaa.gov
15+
* oar.gfdl.cefi-support@noaa.gov
1616

1717
.. toctree::
1818
:numbered:

tools/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This folder contains tools (mainly written in Python) that can be used to generate initial conditions (ICs), boundary conditions (BCs), and other required inputs for regional MOM6 model runs.
44

5-
Below we provide instruction for creating a Python virtual environment on NOAA R&D HPCs, specifically configured for the Gaea system. The process outlined here can generally be applied to other clusters within NOAA RDHPCs. The guide has been provided by Yi-Cheng Teng (Contact: yi-cheng.teng@noaa.gov).
5+
Below we provide instruction for creating a Python virtual environment on NOAA R&D HPCs, specifically configured for the Gaea system. The process outlined here can generally be applied to other clusters within NOAA RDHPCs. If you have any questions, please contact us at oar.gfdl.cefi-support AT noaa DOT gov
66

77
## Install Conda Environment on Gaea
88

0 commit comments

Comments
 (0)