Add most of the new settings to SPECRTA file

Don't know what to use for Qn_fixed, waiting to hear back from UCI and NOAA
folks... so this will still fail the init.py test (but with fewer MARBL ERROR
lines)

tests/input_files/settings/marbl_with_spectra.settings

@@ -1,4 +1,5 @@
 lvariable_PtoC = .false.
+lvariable_NtoC = .false.
 auto_mort2_exp = 2.0
 zoo_mort2_exp = 2.0
 QCaCO3_max = 1.0
@@ -23,7 +24,7 @@ autotroph_settings(1)%kNO3 = 2
 autotroph_settings(1)%kNH4 = 0.2
 autotroph_settings(1)%kSiO3 = 0
 autotroph_settings(1)%Qp_fixed = 0.00333333333333333
-autotroph_settings(1)%gQfe_0 = 6e-05
+autotroph_settings(1)%gQfe_max = 6e-05
 autotroph_settings(1)%gQfe_min = 2.5e-06
 autotroph_settings(1)%alphaPI_per_day = 0.273292295105452
 autotroph_settings(1)%PCref_per_day = 1.49018176181309
@@ -38,6 +39,11 @@ autotroph_settings(1)%agg_rate_min = 0.01
 autotroph_settings(1)%loss_poc = 0
 autotroph_settings(1)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(1)%Ea = 0.32
+autotroph_settings(1)%POpt = 0.8
+autotroph_settings(1)%NOpt = 0.4
+autotroph_settings(1)%SiOpt = 0.0
+autotroph_settings(1)%FeOpt = 0.002
+
 autotroph_settings(2)%sname = 'pp'
 autotroph_settings(2)%lname = 'Picoplankton'
 autotroph_settings(2)%Nfixer = F
@@ -53,7 +59,7 @@ autotroph_settings(2)%kNO3 = 0.166226242046012
 autotroph_settings(2)%kNH4 = 0.0148501069813736
 autotroph_settings(2)%kSiO3 = 0
 autotroph_settings(2)%Qp_fixed = 0.004651163
-autotroph_settings(2)%gQfe_0 = 4.2e-05
+autotroph_settings(2)%gQfe_max = 4.2e-05
 autotroph_settings(2)%gQfe_min = 2.5e-06
 autotroph_settings(2)%alphaPI_per_day = 0.652604714186398
 autotroph_settings(2)%PCref_per_day = 1.29366489140558
@@ -68,6 +74,11 @@ autotroph_settings(2)%agg_rate_min = 0.01
 autotroph_settings(2)%loss_poc = 0
 autotroph_settings(2)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(2)%Ea = 0.42
+autotroph_settings(2)%POpt = 0.8
+autotroph_settings(2)%NOpt = 0.4
+autotroph_settings(2)%SiOpt = 0.0
+autotroph_settings(2)%FeOpt = 0.002
+
 autotroph_settings(3)%sname = 'mp1'
 autotroph_settings(3)%lname = 'Mixed Phytoplankton 1'
 autotroph_settings(3)%Nfixer = F
@@ -83,7 +94,7 @@ autotroph_settings(3)%kNO3 = 0.533272989070712
 autotroph_settings(3)%kNH4 = 0.0476408588710374
 autotroph_settings(3)%kSiO3 = 0
 autotroph_settings(3)%Qp_fixed = 0.00682379278322552
-autotroph_settings(3)%gQfe_0 = 4.2e-05
+autotroph_settings(3)%gQfe_max = 4.2e-05
 autotroph_settings(3)%gQfe_min = 2.5e-06
 autotroph_settings(3)%alphaPI_per_day = 0.364355396811254
 autotroph_settings(3)%PCref_per_day = 2.09685365336932
@@ -98,6 +109,11 @@ autotroph_settings(3)%agg_rate_min = 0.01
 autotroph_settings(3)%loss_poc = 0
 autotroph_settings(3)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(3)%Ea = 0.32
+autotroph_settings(3)%POpt = 0.8
+autotroph_settings(3)%NOpt = 0.4
+autotroph_settings(3)%SiOpt = 0.0
+autotroph_settings(3)%FeOpt = 0.002
+
 autotroph_settings(4)%sname = 'mp2'
 autotroph_settings(4)%lname = 'Mixed Phytoplankton 2'
 autotroph_settings(4)%Nfixer = F
@@ -113,7 +129,7 @@ autotroph_settings(4)%kNO3 = 1.71080135947304
 autotroph_settings(4)%kNH4 = 0.152837379341234
 autotroph_settings(4)%kSiO3 = 0
 autotroph_settings(4)%Qp_fixed = 0.00865578702959568
-autotroph_settings(4)%gQfe_0 = 4.2e-05
+autotroph_settings(4)%gQfe_max = 4.2e-05
 autotroph_settings(4)%gQfe_min = 2.5e-06
 autotroph_settings(4)%alphaPI_per_day = 0.203423071117394
 autotroph_settings(4)%PCref_per_day = 2.29720125231368
@@ -128,6 +144,11 @@ autotroph_settings(4)%agg_rate_min = 0.01
 autotroph_settings(4)%loss_poc = 0
 autotroph_settings(4)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(4)%Ea = 0.32
+autotroph_settings(4)%POpt = 0.8
+autotroph_settings(4)%NOpt = 0.4
+autotroph_settings(4)%SiOpt = 0.0
+autotroph_settings(4)%FeOpt = 0.002
+
 autotroph_settings(5)%sname = 'mp3'
 autotroph_settings(5)%lname = 'Mixed Phytoplankton 3'
 autotroph_settings(5)%Nfixer = F
@@ -143,7 +164,7 @@ autotroph_settings(5)%kNO3 = 5.48844841490125
 autotroph_settings(5)%kNH4 = 0.49031997066067
 autotroph_settings(5)%kSiO3 = 0
 autotroph_settings(5)%Qp_fixed = 0.0129068541199199
-autotroph_settings(5)%gQfe_0 = 4.2e-05
+autotroph_settings(5)%gQfe_max = 4.2e-05
 autotroph_settings(5)%gQfe_min = 2.5e-06
 autotroph_settings(5)%alphaPI_per_day = 0.11357302849083
 autotroph_settings(5)%PCref_per_day = 1.31304517940945
@@ -158,6 +179,11 @@ autotroph_settings(5)%agg_rate_min = 0.01
 autotroph_settings(5)%loss_poc = 0
 autotroph_settings(5)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(5)%Ea = 0.32
+autotroph_settings(5)%POpt = 0.8
+autotroph_settings(5)%NOpt = 0.4
+autotroph_settings(5)%SiOpt = 0.0
+autotroph_settings(5)%FeOpt = 0.002
+
 autotroph_settings(6)%sname = 'mp4'
 autotroph_settings(6)%lname = 'Mixed Phytoplankton 4'
 autotroph_settings(6)%Nfixer = F
@@ -173,7 +199,7 @@ autotroph_settings(6)%kNO3 = 17.607576610946
 autotroph_settings(6)%kNH4 = 1.57300311393013
 autotroph_settings(6)%kSiO3 = 0
 autotroph_settings(6)%Qp_fixed = 0.0185898827866514
-autotroph_settings(6)%gQfe_0 = 4.2e-05
+autotroph_settings(6)%gQfe_max = 4.2e-05
 autotroph_settings(6)%gQfe_min = 2.5e-06
 autotroph_settings(6)%alphaPI_per_day = 0.0634088981634493
 autotroph_settings(6)%PCref_per_day = 0.787845247548101
@@ -188,6 +214,11 @@ autotroph_settings(6)%agg_rate_min = 0.01
 autotroph_settings(6)%loss_poc = 0
 autotroph_settings(6)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(6)%Ea = 0.32
+autotroph_settings(6)%POpt = 0.8
+autotroph_settings(6)%NOpt = 0.4
+autotroph_settings(6)%SiOpt = 0.0
+autotroph_settings(6)%FeOpt = 0.002
+
 autotroph_settings(7)%sname = 'diat1'
 autotroph_settings(7)%lname = 'Diatoms 1'
 autotroph_settings(7)%Nfixer = F
@@ -203,7 +234,7 @@ autotroph_settings(7)%kNO3 = 3.86277655400843
 autotroph_settings(7)%kNH4 = 0.345087781364201
 autotroph_settings(7)%kSiO3 = 0.603903617387351
 autotroph_settings(7)%Qp_fixed = 0.0102886610358285
-autotroph_settings(7)%gQfe_0 = 4.2e-05
+autotroph_settings(7)%gQfe_max = 4.2e-05
 autotroph_settings(7)%gQfe_min = 2.5e-06
 autotroph_settings(7)%alphaPI_per_day = 0.216391484018399
 autotroph_settings(7)%PCref_per_day = 4.43599310179968
@@ -218,6 +249,11 @@ autotroph_settings(7)%agg_rate_min = 0.01
 autotroph_settings(7)%loss_poc = 0
 autotroph_settings(7)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(7)%Ea = 0.32
+autotroph_settings(7)%POpt = 0.8
+autotroph_settings(7)%NOpt = 0.4
+autotroph_settings(7)%SiOpt = 10.0
+autotroph_settings(7)%FeOpt = 0.002
+
 autotroph_settings(8)%sname = 'diat2'
 autotroph_settings(8)%lname = 'Diatoms 2'
 autotroph_settings(8)%Nfixer = F
@@ -233,7 +269,7 @@ autotroph_settings(8)%kNO3 = 7.70592160892738
 autotroph_settings(8)%kNH4 = 0.688421749021883
 autotroph_settings(8)%kSiO3 = 1.20473806078829
 autotroph_settings(8)%Qp_fixed = 0.0126019233707614
-autotroph_settings(8)%gQfe_0 = 4.2e-05
+autotroph_settings(8)%gQfe_max = 4.2e-05
 autotroph_settings(8)%gQfe_min = 2.5e-06
 autotroph_settings(8)%alphaPI_per_day = 0.164161066656736
 autotroph_settings(8)%PCref_per_day = 3.3395019171913
@@ -248,6 +284,11 @@ autotroph_settings(8)%agg_rate_min = 0.01
 autotroph_settings(8)%loss_poc = 0
 autotroph_settings(8)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(8)%Ea = 0.32
+autotroph_settings(8)%POpt = 0.8
+autotroph_settings(8)%NOpt = 0.4
+autotroph_settings(8)%SiOpt = 10.0
+autotroph_settings(8)%FeOpt = 0.002
+
 autotroph_settings(9)%sname = 'diat3'
 autotroph_settings(9)%lname = 'Diatoms 3'
 autotroph_settings(9)%Nfixer = F
@@ -263,7 +304,7 @@ autotroph_settings(9)%kNO3 = 15.3726799913688
 autotroph_settings(9)%kNH4 = 1.37334478390637
 autotroph_settings(9)%kSiO3 = 2.40335337183615
 autotroph_settings(9)%Qp_fixed = 0.0154352905678903
-autotroph_settings(9)%gQfe_0 = 4.2e-05
+autotroph_settings(9)%gQfe_max = 4.2e-05
 autotroph_settings(9)%gQfe_min = 2.5e-06
 autotroph_settings(9)%alphaPI_per_day = 0.124537506307716
 autotroph_settings(9)%PCref_per_day = 2.51404201922674
@@ -278,6 +319,10 @@ autotroph_settings(9)%agg_rate_min = 0.01
 autotroph_settings(9)%loss_poc = 0
 autotroph_settings(9)%temp_func_form_opt = 'arrhenius'
 autotroph_settings(9)%Ea = 0.32
+autotroph_settings(9)%POpt = 0.8
+autotroph_settings(9)%NOpt = 0.4
+autotroph_settings(9)%SiOpt = 10.0
+autotroph_settings(9)%FeOpt = 0.002
 
 
 zooplankton_settings(1)%sname = 'zoo1'