Commit a1f6bdfd authored by Modellers Operational's avatar Modellers Operational

Add options for variable nests and bug fix for no tidal adjustment

parent d92dbcff
......@@ -27,19 +27,22 @@ native_coordinates = sys.argv[6]
fvcom_harmonics = sys.argv[7]
interval = 1/float(sys.argv[8])
adjust_tides = sys.argv[9].split(',')
no_nests = int(sys.argv[10])
constituents = ['M2', 'S2']
output_file = 'boundary_nest.nc'.format(grid)
cmems_time_res = 'hi'
if 'None' in adjust_tides:
adjust_tides = []
##############################################################################################
# Setup preproc Model object
aqua_prep = pf.preproc.Model(start_date, end_date, grid, native_coordinates, zone='30N', sampling=interval)
aqua_prep.add_sigma_coordinates(sigma_file)
# Make the nested boundary object
aqua_prep.add_nests(4)
aqua_prep.add_nests(no_nests)
aqua_prep.add_nests_harmonics(fvcom_harmonics, harmonics_vars=['u', 'v', 'ua', 'va', 'zeta'], constituents=constituents, pool_size=20)
# Make the regular readers for the CMEMS data
......
[command]
default = python3 make_nest_bound.py ${CMEMS_DATA_DIR} ${START_DAY} ${END_DAY} ${ROSE_DATAC}/${GRID_NAME}_grd.dat ${ROSE_DATAC}/sigma_gen.dat ${COORDINATES} ${HARMONICS_FILE_PATH} ${NEST_INTERVAL} ${ADJUST_TIDES}; mv boundary_nest.nc /${REMOTE_TRANSFER_DIR}/
default = python3 make_nest_bound.py ${CMEMS_DATA_DIR} ${START_DAY} ${END_DAY} ${ROSE_DATAC}/${GRID_NAME}_grd.dat ${ROSE_DATAC}/sigma_gen.dat ${COORDINATES} ${HARMONICS_FILE_PATH} ${NEST_INTERVAL} ${ADJUST_TIDES} ${NO_NESTS}; mv boundary_nest.nc /${REMOTE_TRANSFER_DIR}/
......@@ -57,7 +57,8 @@ DONOR_RESTART_FILE_PATH='/users/modellers/modop/Models/FVCOM_tamar_restart/tamar
NEST_RUN_SUITE='fvcom-rosa'
# The time resolution of the nest output, as divisions of 1 day (i.e. 24 would be hourly, 48 every half hour)
NEST_INTERVAL='24'
ADJUST_TIDES='zeta,u,v,ua,va'
ADJUST_TIDES='None'
NEST_DEPTH=1
# FVCOM namelist settings
EXT_TSTEP='.150'
......
......@@ -87,7 +87,7 @@
run_fvcom[-P1D] => transfer_restart => run_fvcom
"""
[[[+P2D/P1D]]]
[[[+P3D/P1D]]]
graph = """
run_fvcom => housekeeping
"""
......@@ -126,6 +126,7 @@
NEST_RUN_SUITE={{NEST_RUN_SUITE}}
NEST_INTERVAL={{NEST_INTERVAL}}
ADJUST_TIDES={{ADJUST_TIDES}}
NO_NESTS={{NEST_DEPTH}}
EXT_TSTEP={{EXT_TSTEP}}
ISPLIT={{ISPLIT}}
......@@ -174,12 +175,15 @@
{% endif %}
{% if BOUNDARY_FORCING in ['CMEMS', 'NEST_FILE'] %}
{% if BOUNDARY_FORCING in ['CMEMS', 'NEST_FILE'] and NEST_DEPTH == 1 %}
NEST_ON='T'
NEST_TYPE='3'
{% else %}
NEST_TYPE='1'
{% elif BOUNDARY_FORCING in ['CMEMS', 'NEST_FILE'] %}
NEST_ON='T'
NEST_TYPE='3'
NEST_TYPE='3'
{% else %}
NEST_ON='F'
NEST_TYPE='1'
{% endif %}
......
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