Merge pull request #146 from chrishavlin/release1pt2_cleanup

release cleanup: history merge, version bump to dev

release_history.md

@@ -1,3 +1,27 @@
+# v1.2.0
+
+## New Features
+* new method: analytical_andrade, see [documentation](https://vbr-calc.github.io/vbr/vbrmethods/anel/andradeanalytical/) for detials.
+* updates to xfit_premelt: 
+  * add direct melt effects from Yamauchi and Takei, 2024. The `xfit_premelt` method will use the updated parameter values when `VBR.in.anelastic.xfit_premelt.include_direct_melt_effect = 1;` (default is 0, a future VBRc version will change the default to 1).
+  * change default exponential melt factor (the alpha in exp(-alpha*phi) in the viscosity relationship) from 25 to 30. 
+* add a `VBR_save` function for saving `VBR` structures
+* add convenience function, `full_nd`, to create filled arrays
+
+## Bug fixes
+* fix for undefined behavior of pre-melt scaling at Tn == 1.0
+
+## Deprecations
+* `vbrListMethods` has been renamed to `VBR_list_methods`
+* `Density_Thermal_Expansion` has been renamed to `density_thermal_expansion`
+* `Density_Adiabatic_Compression` has been renamed to `density_adiabatic_compression`
+
+## Infrastructure improvements
+* add new function for printing deprecation messages, `print_func_deprecation_warning`
+* add framework for handling temporary files in test suite
+* add a development tag to version structure
+* add weekly test runs
+
 # v1.1.2
 
 Minor bug fix release 

release_notes.md

@@ -1,23 +1,9 @@
-# v1.2.0
+# v1.2.0dev
 
 ## New Features
-* new method: analytical_andrade, see [documentation](https://vbr-calc.github.io/vbr/vbrmethods/anel/andradeanalytical/) for detials.
-* updates to xfit_premelt: 
-  * add direct melt effects from Yamauchi and Takei, 2024. The `xfit_premelt` method will use the updated parameter values when `VBR.in.anelastic.xfit_premelt.include_direct_melt_effect = 1;` (default is 0, a future VBRc version will change the default to 1).
-  * change default exponential melt factor (the alpha in exp(-alpha*phi) in the viscosity relationship) from 25 to 30. 
-* add a `VBR_save` function for saving `VBR` structures
-* add convenience function, `full_nd`, to create filled arrays
 
 ## Bug fixes
-* fix for undefined behavior of pre-melt scaling at Tn == 1.0
 
 ## Deprecations
-* `vbrListMethods` has been renamed to `VBR_list_methods`
-* `Density_Thermal_Expansion` has been renamed to `density_thermal_expansion`
-* `Density_Adiabatic_Compression` has been renamed to `density_adiabatic_compression`
 
 ## Infrastructure improvements
-* add new function for printing deprecation messages, `print_func_deprecation_warning`
-* add framework for handling temporary files in test suite
-* add a development tag to version structure
-* add weekly test runs

vbr/support/vbr_version.m

@@ -6,7 +6,7 @@
     Version.version = [num2str(Version.major), '.', ...
                        num2str(Version.minor), '.', ...
                        num2str(Version.patch)];
-    Version.is_development = 0;
+    Version.is_development = 1;
     if Version.is_development == 1
         Version.version = [Version.version, 'dev'];
     end