Commit affa7397 authored by Modellers Operational's avatar Modellers Operational

Merge conflict resolve

parent 066472f9
......@@ -9,13 +9,13 @@ FORECAST=True
REMOTE_USER='modop'
MAIL_TO='mbe@pml.ac.uk'
INITIAL_START_DATE='2018-11-28T00:00:00Z'
INITIAL_START_DATE='2018-12-05T00:00:00Z'
FINAL_CYCLE_POINT='NONE'
RUNDAYS=1
## Grid properties and files
GRID_NAME='aqua_v16'
COMMON_FILES_PATH='/data/sthenno1/backup/mbe/Code/fvcom-projects/mycoast/run/aqua_v16_common'
COMMON_FILES_PATH='/users/modellers/modop/Models/FVCOM_rosa_common/'
## Atmospheric setup
WIND_ON='T'
......@@ -23,10 +23,10 @@ HEATING_ON='T'
PRECIPITATION_ON='T'
AIR_PRESSURE_ON='T'
## WRF suite settings if any of the above are on
WRF_RUN_SUITE='rose-wrf'
WRF_FORECAST_FILE_DIR='/gpfs1/users/modellers/mbe/rose_run_wrf_temp'
WRF_RUN_SUITE='wrf'
WRF_FORECAST_FILE_DIR='/gpfs1/users/modellers/modop/Models/WRF_transfer_dir/'
WRF_ARCHIVE_DIR_PICA='/data/sthenno1/backup/pica/models/WRF/wrf-preprocess-gfs/output'
WRF_ARCHIVE_DIR='/data/sthenno1/backup/mbe/Code/fvcom-projects/mycoast/run/rose_output'
WRF_ARCHIVE_DIR='/pmldata/sthenno1/scratch/modop/Model/output/WRF/'
## River setup
## Between 'NONE', 'NEURAL_NET', and 'CLIMATOLOGY'
......@@ -34,15 +34,15 @@ RIVER_MODEL='NONE'
## Required if 'NEURAL_NET' or 'CLIMATOLOGY', the files expected depend on the RIVER_MODEL value
RIVER_MODEL_PATH='/data/sthenno1/backup/mbe/Code/fvcom-projects/mycoast/run/aqua_v16_river_mod'
## Required if 'NEURAL_NET', must omit first slash to allow use on remote and local
REMOTE_TRANSFER_DIR='data/sthenno1/backup/mbe/rose_rosa_transfer_dir'
REMOTE_TRANSFER_DIR='users/modellers/modop/Rose_suites/rosa_transfer_dir'
## Boundary forcing
## Between 'TIDAL', 'CMEMS', and 'NEST_FILE'
BOUNDARY_FORCING='CMEMS'
## Required for TIDAL and CMEMS
HARMONICS_FILE_PATH='/data/sthenno1/backup/mbe/Data/harmonics_files/aqua_v16_0001_2006_harmonics.nc'
HARMONICS_FILE_PATH='/users/modellers/modop/Models/FVCOM_rosa_harmonics/aqua_v16_0001_2006_harmonics.nc'
## Required for CMEMS
CMEMS_DATA_DIR='/data/sthenno1/backup/mbe/Data/CMEMS'
CMEMS_DATA_DIR='/data/sthenno1/scratch/modop/Data/CMEMS'
## Required for NEST_FILE
NEST_RUN_SUITE='rose-rosa'
# The time resolution of the nest output, as divisions of 1 day (i.e. 24 would be hourly, 48 every half hour)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment