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

app/generate_CMEMS_nest/file/tamar_v2_obc.dat

-OBC Node Number = 45
-1 1 1
-2 2 1
-3 3 1
-4 4 1
-5 5 1
-6 6 1
-7 7 1
-8 8 1
-9 9 1
-10 10 1
-11 11 1
-12 12 1
-13 13 1
-14 14 1
-15 15 1
-16 16 1
-17 17 1
-18 18 1
-19 19 1
-20 20 1
-21 21 1
-22 22 1
-23 23 1
-24 24 1
-25 25 1
-26 26 1
-27 27 1
-28 28 1
-29 29 1
-30 30 1
-31 31 1
-32 32 1
-33 33 1
-34 34 1
-35 35 1
-36 36 1
-37 37 1
-38 38 1
-39 39 1
-40 40 1
-41 41 1
-42 42 1
-43 43 1
-44 44 1
-45 45 1

app/generate_rivers/file/river_make.py

@@ -52,7 +52,7 @@ for this_river in river_list:
     try:
         this_river._expandDateSeries(start_date, end_date)
     except:
-        pass
+        this_river.use_ltls_temp = False
 
 # Get and write out the forecast predictions
 grid = common_dir + '/' + grid_name + '_grd.dat'
@@ -72,3 +72,5 @@ aqua_prep.add_rivers(positions, names, times, flux_array, temperature, salinity,
 aqua_prep.check_rivers(max_discharge=400, min_depth=None, open_boundary_proximity=None, noisy=False)
 aqua_prep.write_river_forcing(output_file, ersem=False)
 aqua_prep.write_river_namelist(output_file_nml, output_file, vertical_distribution='uniform')
+
+

rose-suite_ROSA.conf

@@ -3,8 +3,7 @@
 COLD_START=True
 SEDIMENT=False
 USE_CETO=True
-MIN_NODES=4
-MAX_NODES=10
+NODES=10
 FORECAST=True
 REMOTE_USER='modop'
 MAIL_TO='mbe@pml.ac.uk'

rose-suite_TAMAR.conf

@@ -3,9 +3,8 @@
 COLD_START=True
 SEDIMENT=False
 USE_CETO=True
-MIN_NODES=4
-MAX_NODES=10
 FORECAST=True
+NODES=10
 REMOTE_USER='modop'
 
 INITIAL_START_DATE='2019-02-05T00:00:00Z'

suite.rc

@@ -174,7 +174,7 @@
 			submission polling intervals = PT10S
 			execution polling intervals = PT10S, PT1M
 		[[[directives]]]
-			--nodes = {{MIN_NODES}}-{{MAX_NODES}}
+			--nodes = {{NODES}}
 			--ntasks-per-node=20
 			--threads-per-core=1
 			--time=24:00:00