COSIMA · ashjbarnes · Nov 15, 2023 · Nov 15, 2023 · Nov 15, 2023 · Nov 15, 2023
diff --git a/demos/model-forced.ipynb → demos/access_om2-forced.ipynb b/demos/model-forced.ipynb → demos/access_om2-forced.ipynb
diff --git a/...om6/default_rundir/era5_surface/MOM_input → ...de_run_directories/era5_surface/MOM_input b/...om6/default_rundir/era5_surface/MOM_input → ...de_run_directories/era5_surface/MOM_input
diff --git a/.../default_rundir/era5_surface/MOM_override → ...run_directories/era5_surface/MOM_override b/.../default_rundir/era5_surface/MOM_override → ...run_directories/era5_surface/MOM_override
diff --git a/...om6/default_rundir/era5_surface/README.md → ...de_run_directories/era5_surface/README.md b/...om6/default_rundir/era5_surface/README.md → ...de_run_directories/era5_surface/README.md
diff --git a/...om6/default_rundir/era5_surface/SIS_input → ...de_run_directories/era5_surface/SIS_input b/...om6/default_rundir/era5_surface/SIS_input → ...de_run_directories/era5_surface/SIS_input
diff --git a/...6/default_rundir/era5_surface/config.yaml → ..._run_directories/era5_surface/config.yaml b/...6/default_rundir/era5_surface/config.yaml → ..._run_directories/era5_surface/config.yaml
@@ -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
 
@@ -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

diff --git a/demos/premade_run_directories/era5_surface/data_table b/demos/premade_run_directories/era5_surface/data_table
@@ -0,0 +1,22 @@
+
+"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", "", "", "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
diff --git a/...m6/default_rundir/era5_surface/diag_table → ...e_run_directories/era5_surface/diag_table b/...m6/default_rundir/era5_surface/diag_table → ...e_run_directories/era5_surface/diag_table
diff --git a/...6/default_rundir/era5_surface/field_table → ..._run_directories/era5_surface/field_table b/...6/default_rundir/era5_surface/field_table → ..._run_directories/era5_surface/field_table
diff --git a/...om6/default_rundir/era5_surface/input.nml → ...de_run_directories/era5_surface/input.nml b/...om6/default_rundir/era5_surface/input.nml → ...de_run_directories/era5_surface/input.nml
diff --git a/...mom6/default_rundir/jra_surface/MOM_input → ...ade_run_directories/jra_surface/MOM_input b/...mom6/default_rundir/jra_surface/MOM_input → ...ade_run_directories/jra_surface/MOM_input
diff --git a/...6/default_rundir/jra_surface/MOM_override → ..._run_directories/jra_surface/MOM_override b/...6/default_rundir/jra_surface/MOM_override → ..._run_directories/jra_surface/MOM_override
diff --git a/...mom6/default_rundir/jra_surface/README.md → ...ade_run_directories/jra_surface/README.md b/...mom6/default_rundir/jra_surface/README.md → ...ade_run_directories/jra_surface/README.md
diff --git a/...mom6/default_rundir/jra_surface/SIS_input → ...ade_run_directories/jra_surface/SIS_input b/...mom6/default_rundir/jra_surface/SIS_input → ...ade_run_directories/jra_surface/SIS_input
diff --git a/...m6/default_rundir/jra_surface/config.yaml → ...e_run_directories/jra_surface/config.yaml b/...m6/default_rundir/jra_surface/config.yaml → ...e_run_directories/jra_surface/config.yaml
@@ -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
 
@@ -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

diff --git a/...om6/default_rundir/jra_surface/data_table → ...de_run_directories/jra_surface/data_table b/...om6/default_rundir/jra_surface/data_table → ...de_run_directories/jra_surface/data_table
diff --git a/...om6/default_rundir/jra_surface/diag_table → ...de_run_directories/jra_surface/diag_table b/...om6/default_rundir/jra_surface/diag_table → ...de_run_directories/jra_surface/diag_table
@@ -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"

diff --git a/...m6/default_rundir/jra_surface/field_table → ...e_run_directories/jra_surface/field_table b/...m6/default_rundir/jra_surface/field_table → ...e_run_directories/jra_surface/field_table
diff --git a/...mom6/default_rundir/jra_surface/input.nml → ...ade_run_directories/jra_surface/input.nml b/...mom6/default_rundir/jra_surface/input.nml → ...ade_run_directories/jra_surface/input.nml
diff --git a/demos/reanalysis-forced.ipynb b/demos/reanalysis-forced.ipynb
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,6 +15,8 @@ dependencies = [
   "scipy>=1.2.0",
   "xarray",
   "xesmf>=0.8",
+  "ruamel.yaml>=0.18.0",
+  "f90nml>=1.4.1",
 ]
 
 [build-system]

diff --git a/regional_mom6/default_rundir/era5_surface/data_table b/regional_mom6/default_rundir/era5_surface/data_table
diff --git a/regional_mom6/default_rundir/era5_surface/env.yaml b/regional_mom6/default_rundir/era5_surface/env.yaml
diff --git a/regional_mom6/default_rundir/era5_surface/job.yaml b/regional_mom6/default_rundir/era5_surface/job.yaml
diff --git a/regional_mom6/default_rundir/jra_surface/env.yaml b/regional_mom6/default_rundir/jra_surface/env.yaml
diff --git a/regional_mom6/default_rundir/jra_surface/job.yaml b/regional_mom6/default_rundir/jra_surface/job.yaml