diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 459afe17..00000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: python - -python: - - '3.6' - -git: - depth: 3 - quiet: true - -install: - - pip install pytest pyyaml - -env: - global: - - CCONF_DIR=${TRAVIS_BUILD_DIR} - -before_script: - - git clone https://github.com/COSIMA/cleanconfig.git - -script: - - (cd cleanconfig && pytest -s test.py) - - pytest -s cleanconfig/test_shell_paths.py diff --git a/config.yaml b/config.yaml index d53a84c1..082b4426 100644 --- a/config.yaml +++ b/config.yaml @@ -16,7 +16,7 @@ mem: 1000GB # Model configuration name: common model: access-om2 -input: +input: - /g/data/vk83/experiments/inputs/access-om2/remapping_weights/JRA55/global.1deg/2020.05.30/JRA55_MOM1_conserve2nd.nc - /g/data/vk83/experiments/inputs/access-om2/remapping_weights/JRA55/global.1deg/2020.05.30/JRA55_MOM1_patch.nc - /g/data/vk83/experiments/inputs/access-om2/remapping_weights/JRA55/global.1deg/2020.05.30/rmp_jra55_cice_1st_conserve.nc @@ -40,20 +40,20 @@ submodels: - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/mosaic/global.1deg/2020.05.30/ocean_mosaic.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/bathymetry/global.1deg/2020.10.22/topog.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/bathymetry/global.1deg/2020.10.22/ocean_mask.nc - - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/vertical/global.1deg/2020.10.22/ocean_vgrid.nc + - /g/data/vk83/experiments/inputs/access-om2/ocean/grids/vertical/global.1deg/2020.10.22/ocean_vgrid.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/processor_masks/global.1deg/216.16x15/2020.05.30/ocean_mask_table - - /g/data/vk83/experiments/inputs/access-om2/ocean/chlorophyll/global.1deg/2020.05.30/chl.nc + - /g/data/vk83/experiments/inputs/access-om2/ocean/chlorophyll/global.1deg/2020.05.30/chl.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/initial_conditions/global.1deg/2020.10.22/ocean_temp_salt.res.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/tides/global.1deg/2020.05.30/tideamp.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/tides/global.1deg/2020.05.30/roughness_amp.nc - /g/data/vk83/experiments/inputs/access-om2/ocean/tides/global.1deg/2020.05.30/roughness_cdbot.nc - - /g/data/vk83/experiments/inputs/access-om2/ocean/surface_salt_restoring/global.1deg/2020.05.30/salt_sfc_restore.nc + - /g/data/vk83/experiments/inputs/access-om2/ocean/surface_salt_restoring/global.1deg/2020.05.30/salt_sfc_restore.nc ncpus: 216 - name: ice model: cice5 exe: /g/data/vk83/apps/spack/0.20/release/linux-rocky8-x86_64/intel-19.0.5.281/cice5-git.2023.10.19=2023.10.19-rh3xfkrgajya3ghtliacuhlx3pgvrzqs/bin/cice_auscom_360x300_24x1_24p.exe - input: + input: - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2020.05.30/grid.nc - /g/data/vk83/experiments/inputs/access-om2/ice/grids/global.1deg/2020.10.22/kmt.nc - /g/data/vk83/experiments/inputs/access-om2/ice/initial_conditions/global.1deg/2020.05.30/i2o.nc @@ -84,5 +84,5 @@ platform: nodesize: 48 # sweep and resubmit on specific errors - see https://github.com/payu-org/payu/issues/241#issuecomment-610739771 userscripts: - error: resub.sh + error: tools/resub.sh run: rm -f resubmit.count diff --git a/ocean/diag_table_source.yaml b/tools/diag_table_source.yaml similarity index 100% rename from ocean/diag_table_source.yaml rename to tools/diag_table_source.yaml diff --git a/ocean/make_diag_table.py b/tools/make_diag_table.py similarity index 100% rename from ocean/make_diag_table.py rename to tools/make_diag_table.py diff --git a/resub.sh b/tools/resub.sh similarity index 100% rename from resub.sh rename to tools/resub.sh