Merge branch 'master' of gitlab.ecosystem-modelling.pml.ac.uk:pml-modelling/rose_fvcom_setup

app/update_river_model/file/update_river_data.py

@@ -21,8 +21,8 @@ start_date = end_date
 for this_river in river_dict.values():
     if hasattr(this_river, 'catchment_precipitation'):
         this_river_update = np.max(this_river.catchment_precipitation[0])
-    if this_river_update < start_date:
-        start_date = this_river_update
+        if this_river_update < start_date:
+            start_date = this_river_update
 
 
 if start_date == end_date:

rose-suite_ROSA.conf

@@ -9,10 +9,10 @@ FORECAST=True
 REMOTE_USER='modop'
 MAIL_TO='mbe@pml.ac.uk'
 
-INITIAL_START_DATE='2018-12-05T00:00:00Z'
+INITIAL_START_DATE='2018-12-23T00:00:00Z'
 FINAL_CYCLE_POINT='NONE'
 RUNDAYS=1
-ARCHIVE_DIR='/data/sthenno1/scratch/modop/Model/FVCOM_rosa/output'
+ARCHIVE_DIR='data/sthenno1/scratch/modop/Model/FVCOM_rosa/output'
 
 ## Grid properties and files
 GRID_NAME='aqua_v16'
@@ -22,6 +22,10 @@ ARCHIVE_DIR='data/sthenno1/scratch/modop/Model/FVCOM_rosa/'
 TEMP_ACTIVE='T'
 SALT_ACTIVE='T'
 
+TEMP_ACTIVE='T'
+SALT_ACTIVE='T'
+
+
 ## Atmospheric setup
 WIND_ON='T'
 HEATING_ON='T'
@@ -30,10 +34,9 @@ AIR_PRESSURE_ON='T'
 ## WRF suite settings if any of the above are on
 WRF_RUN_SUITE='wrf'
 WRF_FORECAST_FILE_DIR='/gpfs1/users/modellers/modop/Models/WRF_transfer_dir/'
-WRF_ARCHIVE_DIR='data/sthenno1/backup/pica/models/WRF/wrf-preprocess-gfs/output'
+WRF_ARCHIVE_DIR='/data/sthenno1/scratch/modop/Model/WRF/output'
 WRF_ARCHIVE_DATEFMT='%Y%m%d'
 
-
 ## River setup
 ## Between 'NONE', 'NEURAL_NET', and 'CLIMATOLOGY'
 RIVER_MODEL='NONE'
@@ -52,7 +55,7 @@ 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)
-NEST_INTERVAL='144'
+NEST_INTERVAL='24'
 
 ## FVCOM namelist settings
 EXT_TSTEP='.150'
@@ -71,5 +74,5 @@ VELOCITY_OUT='T'
 SALT_TEMP_OUT='T'
 TURBULENCE_OUT='T'
 WIND_OUT='F'
-SURF_HEAT_RAIN_OUT='F'
+HEAT_RAIN_OUT='F'