Skip to content

Commit

Permalink
Declutter notebook (#84)
Browse files Browse the repository at this point in the history
* Modify notebook to remove mentions of NCI

* modify notebook

* migrate era5 and setup rundir functions from notebook to package

* decluttered notebook, added functions to library instead. reanalysis notebook now has no mention of NCI

* update docstrings

* black

* docstring vgrid

* delete model-forced notebook to migrate it to cosima recipes

* update the model forced example to include for now

* fix diag table

* fix diag table

* execute notebook to keep sphinx happy
  • Loading branch information
ashjbarnes authored Nov 21, 2023
1 parent 9388117 commit 9333baf
Show file tree
Hide file tree
Showing 11 changed files with 398 additions and 1,160 deletions.
213 changes: 58 additions & 155 deletions demos/model-forced.ipynb → demos/access_om2-forced.ipynb

Large diffs are not rendered by default.

884 changes: 113 additions & 771 deletions demos/reanalysis-forced.ipynb

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions regional_mom6/default_rundir/era5_surface/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
## Example of a config.yaml file for using MOM6 with Payu

project: x77
queue: normal
walltime: 02:00:00
jobname: mom6_GIPPSLAND
jobname: mom6_regional
ncpus: 82
jobfs: 10GB

Expand All @@ -10,15 +12,10 @@ shortpath: /scratch/x77
model: mom6
input:
- /scratch/v45/ab8992/mom6/regional_configs/gippsland
# - /g/data/ua8/JRA55-do/RYF/v1-3/
- /g/data/ik11/inputs/JRA-55/RYF/v1-3/
# release exe
exe: /g/data/x77/ahg157/exes/MOM6_SIS2/symmetric_FMS2-e7d09b7
# debug exe
#exe: /g/data/x77/ahg157/exes/MOM6_SIS2/symmetric_FMS2-9bc3419a


collate: false
#runlog: true
storage:
gdata:
- ua8
Expand Down
29 changes: 15 additions & 14 deletions regional_mom6/default_rundir/era5_surface/data_table
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
"ATM", "p_surf", "sp", "./INPUT/forcing/sp_ERA5", "bilinear", 1.0
"ATM", "p_bot", "sp", "./INPUT/forcing/sp_ERA5", "bilinear", 1.0
"ATM", "t_bot", "t2m", "./INPUT/forcing/2t_ERA5", "bilinear", 1.0
"ATM", "sphum_bot", "q", "./INPUT/forcing/q_ERA5", "bilinear", 1.0
"ATM", "u_bot", "u10", "./INPUT/forcing/10u_ERA5", "bicubic", 1.0
"ATM", "v_bot", "v10", "./INPUT/forcing/10v_ERA5", "bicubic", 1.0

"ATM", "p_surf", "", "", "bilinear", 100410.25
"ATM", "p_bot", "", "", "bilinear", 100410.25
"ATM", "t_bot", "", "", "bilinear", 289.9
"ATM", "sphum_bot", "", "", "bilinear", 0.0083
"ATM", "u_bot", "", "", "bicubic", 0.0
"ATM", "v_bot", "", "", "bicubic", 0.0
"ATM", "z_bot", "", "", "bilinear", 10.0
"ATM", "gust", "", "", "bilinear", 1.0e-4
"ICE", "lw_flux_dn", "rlds", "./INPUT/RYF.rlds.1990_1991.nc", "bilinear", 1.0
"ICE", "sw_flux_vis_dir_dn", "rsds", "./INPUT/RYF.rsds.1990_1991.nc", "bilinear", 0.285
"ICE", "sw_flux_vis_dif_dn", "rsds", "./INPUT/RYF.rsds.1990_1991.nc", "bilinear", 0.285
"ICE", "sw_flux_nir_dir_dn", "rsds", "./INPUT/RYF.rsds.1990_1991.nc", "bilinear", 0.215
"ICE", "sw_flux_nir_dif_dn", "rsds", "./INPUT/RYF.rsds.1990_1991.nc", "bilinear", 0.215
"ICE", "lprec", "prrn", "./INPUT/RYF.rain.1990_1991.nc", "bilinear", 1.0
"ICE", "fprec", "prsn", "./INPUT/RYF.snow.1990_1991.nc", "bilinear", 1.0
"ICE", "lw_flux_dn", "", "", "bilinear", 1.0
"ICE", "sw_flux_vis_dir_dn", "", "", "bilinear", 0.0
"ICE", "sw_flux_vis_dif_dn", "", "", "bilinear", 0.0
"ICE", "sw_flux_nir_dir_dn", "", "", "bilinear", 0.0
"ICE", "sw_flux_nir_dif_dn", "", "", "bilinear", 0.0
"ICE", "lprec", "", "", "bilinear", 0.0
"ICE", "fprec", "", "", "bilinear", 0.0
"ICE", "runoff", "", "", "none", 0.0
"ICE", "dhdt", "", "", "none", 80.0
"ICE", "dedt", "", "", "none", 2.0e-6
"ICE", "drdt", "", "", "none", 10.0
"LND", "rough_mom", "", "", "none", 0.01
"LND", "rough_heat", "", "", "none", 0.1"""
"LND", "rough_heat", "", "", "none", 0.1
93 changes: 0 additions & 93 deletions regional_mom6/default_rundir/era5_surface/env.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions regional_mom6/default_rundir/era5_surface/job.yaml

This file was deleted.

10 changes: 4 additions & 6 deletions regional_mom6/default_rundir/jra_surface/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
## Example of a config.yaml file for running mom6 via payu

project: x77
queue: normal
walltime: 02:00:00
jobname: mom6_GIPPSLAND
jobname: mom6_regional
ncpus: 82
jobfs: 10GB

Expand All @@ -10,15 +12,11 @@ shortpath: /scratch/x77
model: mom6
input:
- /scratch/v45/ab8992/mom6/regional_configs/gippsland
# - /g/data/ua8/JRA55-do/RYF/v1-3/
- /g/data/ik11/inputs/JRA-55/RYF/v1-3/
# release exe
exe: /g/data/x77/ahg157/exes/MOM6_SIS2/symmetric_FMS2-e7d09b7
# debug exe
#exe: /g/data/x77/ahg157/exes/MOM6_SIS2/symmetric_FMS2-9bc3419a


collate: false
#runlog: true
storage:
gdata:
- ua8
Expand Down
4 changes: 2 additions & 2 deletions regional_mom6/default_rundir/jra_surface/diag_table
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
eac
1991 1 1 0 0 0
regional_mom6
1990 1 1 0 0 0

"ocean_daily", 1, "days", 1, "days", "time"
"ocean_month", 1, "months", 1, "days", "time"
Expand Down
93 changes: 0 additions & 93 deletions regional_mom6/default_rundir/jra_surface/env.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions regional_mom6/default_rundir/jra_surface/job.yaml

This file was deleted.

Loading

0 comments on commit 9333baf

Please sign in to comment.