PPv3.1 - Optimizations, Monte Carlo, Plotting Extensibility, Framework for Non-self consistent modeling, and Bug Fixes

.gitignore

@@ -6,6 +6,7 @@ configPP.py
 configPPplots.py
 configPPinduct.py
 configPPtrajec.py
+configPPmontecarlo.py
 */PP*.py
 *~
 .DS_Store

PlanetProfile/CustomSolution/defaultConfigCustomSolution.py

@@ -1,7 +1,7 @@
 """ Default custom ocean solution settings """
 from PlanetProfile.Utilities.defineStructs import CustomSolutionParamsStruct
 
-configCustomSolutionVersion = 6 # Integer number for config file version. Increment when new settings are added to the default config file.
+configCustomSolutionVersion = 7 # Integer number for config file version. Increment when new settings are added to the default config file.
 
 def customSolutionAssign():
     CustomSolutionParams = CustomSolutionParamsStruct()
@@ -22,6 +22,7 @@ def customSolutionAssign():
     CustomSolutionParams.SOLID_PHASES = True
     # Only valid if SOLID_PHASES is True. Specify the Solid Phases to consider - specifying only primary phases can speed up runtime. 'All' considers all possible phases available in database
     CustomSolutionParams.SOLID_PHASES_TO_CONSIDER = ['Carbonates', 'Sulfates'] # Can specify minerals specifically, or add keywords that include 'Carbonates', 'Sulfates' that are defined in Constants.py
+    CustomSolutionParams.SOLID_PHASES_TO_SUPPRESS = None # Specify solid phases to suppress from equilibrium calculations. None suppresses none. Should be in a list format like ['Dolomite', 'Calcite']
 
     # Have PlanetProfile remove species that Frezchem does not have in database so we can consider more diverse speciated compositions in the ocean thermodynamcis
     # This removes self-consistency between the phase equilibria (up to 200MPa) and ocean thermodynamics since frezchem is calculating liquid-IceI equilibria of a less speciated chemistry

PlanetProfile/Gravity/defaultConfigGravity.py

@@ -1,7 +1,7 @@
 """ Configuration settings specific to gravity response calculations and plots """
 from PlanetProfile.Utilities.defineStructs import GravityParamsStruct
 
-configGravityVersion = 3 # Integer number for config file version. Increment when new settings are added to the default config file.
+configGravityVersion = 4 # Integer number for config file version. Increment when new settings are added to the default config file.
 
 def gravityAssign():
     GravityParams = GravityParamsStruct()
@@ -12,14 +12,14 @@ def gravityAssign():
     GravityParams.parallel = False  # Use Parallel computing for PyALMA calculations. #TODO: Need to implement way to do this if Parallel already being used in Exploreogram
 
     # Parsing parameters
-    GravityParams.rheology_models = {'0': 'newton', 'Ih': 'maxwell', 'Ih_conv': 'andrade','II': 'maxwell', 'III': 'maxwell', 'III_conv': 'andrade',
+    GravityParams.rheology_models = {'0': 'newton', 'Ih': 'elastic', 'Ih_conv': 'andrade','II': 'maxwell', 'III': 'maxwell', 'III_conv': 'andrade',
                                      'IV': 'maxwell', 'V': 'maxwell','V_conv': 'andrade', 'VI': 'maxwell',
                                      'Sil': 'elastic', 'Fe': 'elastic', 'Clath': 'newton', 'Clath_conv': 'andrade'}  # Rheology structure model, where each model corresponds to a layer
 
     # General parameters
     GravityParams.num_digits = 128  # Set precision
-    GravityParams.gorder = 8  # Order of Gaver method
-    GravityParams.tau = 0  # TODO: FIGURE OUT WHAT TAU DOES
+    GravityParams.gorder = 4  # Order of Gaver method
+    GravityParams.tau = 2  # TODO: FIGURE OUT WHAT TAU DOES
     GravityParams.loading_type = 'tidal'  # Loading type to calculate love numbers - 'tidal' or 'loading'
 
     # Harmonic degrees parameters
@@ -29,6 +29,6 @@ def gravityAssign():
     GravityParams.ramp_function_length_kyrs = None  # Ramp length in kyrs
 
     # Output parameters
-    GravityParams.output_type = 'real'  # Output type - 'complex' or 'real'
+    GravityParams.output_type = 'complex'  # Output type - 'complex' or 'real'
 
     return GravityParams