MAGEMin v1.4.7

- correction of segfault for MAGEMin_jll due to wrong number of site fractions names for igneous biotite
ComputationalThermodynamics · Jun 4, 2024 · 631e248 · 631e248
2 parents 3333399 + a5a62a7
commit 631e248
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MAGEMin_C"
 uuid = "e5d170eb-415a-4524-987b-12f1bce1ddab"
 authors = ["Boris Kaus <[email protected]> & Nicolas Riel <[email protected]>"]
-version = "1.4.6"
+version = "1.4.9"
 
 [deps]
 CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"

diff --git a/doc_raw/index.rst b/doc_raw/index.rst
@@ -10,7 +10,7 @@
 
 |
 
-**MAGEMin v1.4.6**
+**MAGEMin v1.4.7**
 ==================
 
 MAGEMin (Mineral Assemblage Gibbs Energy Minimization) is a parallel C library callable from any petrological/geodynamic tool. For a given set of pressure, temperature and bulk-rock composition MAGEMin uses a combination of linear programming, extended Partitioning Gibbs free Energy and gradient-based local minimization to compute the most stable mineral assemblage     

diff --git a/docs/index.html b/docs/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>MAGEMin v1.4.6 &mdash; MAGEMin 2022 documentation</title>
+  <title>MAGEMin v1.4.7 &mdash; MAGEMin 2022 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
@@ -247,7 +247,7 @@
           <div role="navigation" aria-label="Page navigation">
   <ul class="wy-breadcrumbs">
       <li><a href="#" class="icon icon-home"></a> &raquo;</li>
-      <li><strong>MAGEMin v1.4.6</strong></li>
+      <li><strong>MAGEMin v1.4.7</strong></li>
       <li class="wy-breadcrumbs-aside">
             <a href="_sources/index.rst.txt" rel="nofollow"> View page source</a>
       </li>
@@ -262,8 +262,8 @@
 <div class="line-block">
 <div class="line"><br /></div>
 </div>
-<section id="magemin-v1-4-6">
-<h1><strong>MAGEMin v1.4.6</strong><a class="headerlink" href="#magemin-v1-4-6" title="Permalink to this headline"></a></h1>
+<section id="magemin-v1-4-7">
+<h1><strong>MAGEMin v1.4.7</strong><a class="headerlink" href="#magemin-v1-4-7" title="Permalink to this headline"></a></h1>
 <p>MAGEMin (Mineral Assemblage Gibbs Energy Minimization) is a parallel C library callable from any petrological/geodynamic tool. For a given set of pressure, temperature and bulk-rock composition MAGEMin uses a combination of linear programming, extended Partitioning Gibbs free Energy and gradient-based local minimization to compute the most stable mineral assemblage</p>
 <p>A full description of the minimization approach used in MAGEMin is given in:</p>
 <p>Riel, N., Kaus, B. J. P., Green, E. C. R., &amp; Berlie, N. (2022). MAGEMin, an efficient Gibbs energy minimizer: Application to igneous systems. Geochemistry, Geophysics, Geosystems, 23, e2022GC010427. <a class="reference external" href="https://doi.org/10.1029/2022GC010427">https://doi.org/10.1029/2022GC010427</a></p>

diff --git a/docs/searchindex.js b/docs/searchindex.js
diff --git a/docs/stp.html b/docs/stp.html
@@ -20,7 +20,7 @@
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
     <link rel="next" title="External libraries" href="stp/Linux.html" />
-    <link rel="prev" title="MAGEMin v1.4.6" href="index.html" /> 
+    <link rel="prev" title="MAGEMin v1.4.7" href="index.html" /> 
 </head>
 
 <body class="wy-body-for-nav"> 
@@ -292,7 +292,7 @@ <h1>Optional (developers)<a class="headerlink" href="#optional-developers" title
            </div>
           </div>
           <footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
-        <a href="index.html" class="btn btn-neutral float-left" title="MAGEMin v1.4.6" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
+        <a href="index.html" class="btn btn-neutral float-left" title="MAGEMin v1.4.7" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
         <a href="stp/Linux.html" class="btn btn-neutral float-right" title="External libraries" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
     </div>
 

diff --git a/src/gss_function.c b/src/gss_function.c
@@ -4421,7 +4421,7 @@ SS_ref G_SS_ig_bi_function(SS_ref SS_ref_db, int EM_database, int len_ox, bulk_i
     for (int i = 0; i < SS_ref_db.n_xeos; i++){
         strcpy(SS_ref_db.CV_list[i],CV_tmp[i]);
     };
-    char   *SF_tmp[] 		= {"xMgM3","xFeM3","xFe3M3","xTiM3","xAlM3","xMgM12","xFeM12","xSiT","xAlT","xOHV"};
+    char   *SF_tmp[] 		= {"xMgM3","xFeM3","xFe3M3","xTiM3","xAlM3","xMgM12","xFeM12","xSiT","xAlT","xOHV","xOV"};
     for (int i = 0; i < SS_ref_db.n_sf; i++){
         strcpy(SS_ref_db.SF_list[i],SF_tmp[i]);
     };    
@@ -5683,7 +5683,7 @@ SS_ref G_SS_ig_ilm_function(SS_ref SS_ref_db, int EM_database, int len_ox, bulk_
     for (int i = 0; i < SS_ref_db.n_xeos; i++){
         strcpy(SS_ref_db.CV_list[i],CV_tmp[i]);
     };
-    char   *SF_tmp[] 		= {"xFeA","xTiA","xFe3A","xMgA","xFeB","xTiB","xMgB"};
+    char   *SF_tmp[] 		= {"xFeA","xTiA","xFe3A","xFe2B","xTiB","xFe3B"};
     for (int i = 0; i < SS_ref_db.n_sf; i++){
         strcpy(SS_ref_db.SF_list[i],SF_tmp[i]);
     };

diff --git a/src/initialize.h b/src/initialize.h
@@ -180,7 +180,7 @@ global_variable global_variable_alloc( bulk_info  *z_b ){
 	}
 
 	strcpy(gv.outpath,"./output/");				/** define the outpath to save logs and final results file	 						*/
-	strcpy(gv.version,"1.4.6 [04/06/2024]");	/** MAGEMin version 																*/
+	strcpy(gv.version,"1.4.7 [04/06/2024]");	/** MAGEMin version 																*/
 
 	/* generate parameters        		*/
 	strcpy(gv.buffer,"none");