Resolve merge, update some .conf settings to modop settings

rose-suite.conf

-rose-suite_ROSA.conf
\ No newline at end of file
+rose-suite_TAMAR.conf
\ No newline at end of file

rose-suite_ROSA.conf

@@ -9,8 +9,8 @@ FORECAST=True
 REMOTE_USER='modop'
 MAIL_TO='mbe@pml.ac.uk'
 
-INITIAL_START_DATE='2018-11-08T00:00:00Z'
-FINAL_CYCLE_POINT='+P5D'
+INITIAL_START_DATE='2018-11-28T00:00:00Z'
+FINAL_CYCLE_POINT='NONE'
 RUNDAYS=1
 
 ## Grid properties and files

rose-suite_TAMAR.conf

@@ -6,15 +6,16 @@ USE_CETO=True
 MIN_NODES=4
 MAX_NODES=10
 FORECAST=True
+REMOTE_USER='modop'
 
-INITIAL_START_DATE='2018-11-22T00:00:00Z'
-FINAL_CYCLE_POINT='+P2D'
+INITIAL_START_DATE='2018-11-28T00:00:00Z'
+FINAL_CYCLE_POINT='NONE'
 RUNDAYS=1
 MAIL_TO='mbe@pml.ac.uk'
 
 ## Grid properties and files
 GRID_NAME='tamar_v2'
-COMMON_FILES_PATH='/data/sthenno1/backup/mbe/Code/fvcom-projects/mycoast/run/tamar_v2_common'
+COMMON_FILES_PATH='/users/modellers/modop/Models/FVCOM_tamar_common/'
 
 ## Atmospheric setup
 WIND_ON='T'
@@ -22,28 +23,28 @@ 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'
 RIVER_MODEL='NEURAL_NET'
 ## 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/rose_fvcom_prep/river_mod/'
+RIVER_MODEL_PATH='/users/modellers/modop/Models/FVCOM_tamar_rivermod'
 ## Required if 'NEURAL_NET', must omit first slash to allow use on remote and local
-REMOTE_TRANSFER_DIR='data/sthenno1/backup/mbe/rose_transfer_dir'
+REMOTE_TRANSFER_DIR='users/modellers/modop/Rose_suites/tamar_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/tamar_2006_harmonics.nc'
+HARMONICS_FILE_PATH='/users/modellers/modop/Models/FVCOM_tamar_harmonics/tamar_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'
+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'
 

suite.rc

@@ -6,7 +6,7 @@
 [scheduling]
 	initial cycle point = {{INITIAL_START_DATE}}
 {% if FINAL_CYCLE_POINT != 'NONE' %}
-	final cycle point = {{FINAL_CYCLE_POINT}}
+        final cycle point = {{FINAL_CYCLE_POINT}}
 {% endif %}
 	[[special tasks]]
 		clock-trigger = start_cycle(PT0M)
@@ -154,7 +154,7 @@
 
 	[[generate_tide_forcing]]
 		inherit = slurm_job_1
-	[[CMEMS_download_trigger]]
+    	[[CMEMS_download_trigger]]
         script =""
         [[[suite state polling]]]
             interval = PT1M