diff --git a/Python-Scripts/1-ParameterFamily-Minimizers.py b/JNLS_plotScripts/1-ParameterFamily-Minimizers.py similarity index 100% rename from Python-Scripts/1-ParameterFamily-Minimizers.py rename to JNLS_plotScripts/1-ParameterFamily-Minimizers.py diff --git a/Python-Scripts/1-ParameterFamily-MinimizersTest.py b/JNLS_plotScripts/1-ParameterFamily-MinimizersTest.py similarity index 100% rename from Python-Scripts/1-ParameterFamily-MinimizersTest.py rename to JNLS_plotScripts/1-ParameterFamily-MinimizersTest.py diff --git a/Python-Scripts/1-ParameterFamily-Minimizers_Test.py b/JNLS_plotScripts/1-ParameterFamily-Minimizers_Test.py similarity index 100% rename from Python-Scripts/1-ParameterFamily-Minimizers_Test.py rename to JNLS_plotScripts/1-ParameterFamily-Minimizers_Test.py diff --git a/Python-Scripts/1-ParameterFamily-Minimizers_v2.py b/JNLS_plotScripts/1-ParameterFamily-Minimizers_v2.py similarity index 100% rename from Python-Scripts/1-ParameterFamily-Minimizers_v2.py rename to JNLS_plotScripts/1-ParameterFamily-Minimizers_v2.py diff --git a/Python-Scripts/1-ParameterFamily-Minimizers_v3.py b/JNLS_plotScripts/1-ParameterFamily-Minimizers_v3.py similarity index 100% rename from Python-Scripts/1-ParameterFamily-Minimizers_v3.py rename to JNLS_plotScripts/1-ParameterFamily-Minimizers_v3.py diff --git a/Python-Scripts/1-ParameterFamily_G+.py b/JNLS_plotScripts/1-ParameterFamily_G+.py similarity index 100% rename from Python-Scripts/1-ParameterFamily_G+.py rename to JNLS_plotScripts/1-ParameterFamily_G+.py diff --git a/Python-Scripts/1-ParameterFamily_G+_Flat.py b/JNLS_plotScripts/1-ParameterFamily_G+_Flat.py similarity index 100% rename from Python-Scripts/1-ParameterFamily_G+_Flat.py rename to JNLS_plotScripts/1-ParameterFamily_G+_Flat.py diff --git a/Python-Scripts/1-ParameterFamily_G+_Flat_v2.py b/JNLS_plotScripts/1-ParameterFamily_G+_Flat_v2.py similarity index 100% rename from Python-Scripts/1-ParameterFamily_G+_Flat_v2.py rename to JNLS_plotScripts/1-ParameterFamily_G+_Flat_v2.py diff --git a/Python-Scripts/1-ParameterFamily_G+_v2.py b/JNLS_plotScripts/1-ParameterFamily_G+_v2.py similarity index 100% rename from Python-Scripts/1-ParameterFamily_G+_v2.py rename to JNLS_plotScripts/1-ParameterFamily_G+_v2.py diff --git a/Python-Scripts/1-ParameterFamily_G+_v3.py b/JNLS_plotScripts/1-ParameterFamily_G+_v3.py similarity index 100% rename from Python-Scripts/1-ParameterFamily_G+_v3.py rename to JNLS_plotScripts/1-ParameterFamily_G+_v3.py diff --git a/Python-Scripts/1-ParameterFamily_G+_v4.py b/JNLS_plotScripts/1-ParameterFamily_G+_v4.py similarity index 100% rename from Python-Scripts/1-ParameterFamily_G+_v4.py rename to JNLS_plotScripts/1-ParameterFamily_G+_v4.py diff --git a/Python-Scripts/1-ParameterFamily_G+_v5.py b/JNLS_plotScripts/1-ParameterFamily_G+_v5.py similarity index 100% rename from Python-Scripts/1-ParameterFamily_G+_v5.py rename to JNLS_plotScripts/1-ParameterFamily_G+_v5.py diff --git a/Python-Scripts/2DPhaseDiagram_PlotScript.py b/JNLS_plotScripts/2DPhaseDiagram_PlotScript.py similarity index 100% rename from Python-Scripts/2DPhaseDiagram_PlotScript.py rename to JNLS_plotScripts/2DPhaseDiagram_PlotScript.py diff --git a/Python-Scripts/2DPhaseDiagram_PlotScriptV2.py b/JNLS_plotScripts/2DPhaseDiagram_PlotScriptV2.py similarity index 100% rename from Python-Scripts/2DPhaseDiagram_PlotScriptV2.py rename to JNLS_plotScripts/2DPhaseDiagram_PlotScriptV2.py diff --git a/Python-Scripts/2DPhaseDiagram_Ratios_PlotScript.py b/JNLS_plotScripts/2DPhaseDiagram_Ratios_PlotScript.py similarity index 100% rename from Python-Scripts/2DPhaseDiagram_Ratios_PlotScript.py rename to JNLS_plotScripts/2DPhaseDiagram_Ratios_PlotScript.py diff --git a/Python-Scripts/CellScript.py b/JNLS_plotScripts/CellScript.py similarity index 100% rename from Python-Scripts/CellScript.py rename to JNLS_plotScripts/CellScript.py diff --git a/Python-Scripts/ClassifyMin.py b/JNLS_plotScripts/ClassifyMin.py similarity index 100% rename from Python-Scripts/ClassifyMin.py rename to JNLS_plotScripts/ClassifyMin.py diff --git a/Python-Scripts/ClassifyMinVec.py b/JNLS_plotScripts/ClassifyMinVec.py similarity index 100% rename from Python-Scripts/ClassifyMinVec.py rename to JNLS_plotScripts/ClassifyMinVec.py diff --git a/Python-Scripts/ClassifyMin_New.py b/JNLS_plotScripts/ClassifyMin_New.py similarity index 100% rename from Python-Scripts/ClassifyMin_New.py rename to JNLS_plotScripts/ClassifyMin_New.py diff --git a/Python-Scripts/CylindricalMinimizer-Plot.py b/JNLS_plotScripts/CylindricalMinimizer-Plot.py similarity index 100% rename from Python-Scripts/CylindricalMinimizer-Plot.py rename to JNLS_plotScripts/CylindricalMinimizer-Plot.py diff --git a/Python-Scripts/CylindricalMinimizer-Plot_newColors.py b/JNLS_plotScripts/CylindricalMinimizer-Plot_newColors.py similarity index 100% rename from Python-Scripts/CylindricalMinimizer-Plot_newColors.py rename to JNLS_plotScripts/CylindricalMinimizer-Plot_newColors.py diff --git a/Python-Scripts/CylindricalMinimizer-Plot_v2.py b/JNLS_plotScripts/CylindricalMinimizer-Plot_v2.py similarity index 100% rename from Python-Scripts/CylindricalMinimizer-Plot_v2.py rename to JNLS_plotScripts/CylindricalMinimizer-Plot_v2.py diff --git a/Python-Scripts/Energy_ContourG+.py b/JNLS_plotScripts/Energy_ContourG+.py similarity index 100% rename from Python-Scripts/Energy_ContourG+.py rename to JNLS_plotScripts/Energy_ContourG+.py diff --git a/Python-Scripts/Energy_ContourG+_plotly.py b/JNLS_plotScripts/Energy_ContourG+_plotly.py similarity index 100% rename from Python-Scripts/Energy_ContourG+_plotly.py rename to JNLS_plotScripts/Energy_ContourG+_plotly.py diff --git a/Python-Scripts/Energy_ContourG+_v2.py b/JNLS_plotScripts/Energy_ContourG+_v2.py similarity index 100% rename from Python-Scripts/Energy_ContourG+_v2.py rename to JNLS_plotScripts/Energy_ContourG+_v2.py diff --git a/Python-Scripts/Energy_ContourG+_v3.py b/JNLS_plotScripts/Energy_ContourG+_v3.py similarity index 100% rename from Python-Scripts/Energy_ContourG+_v3.py rename to JNLS_plotScripts/Energy_ContourG+_v3.py diff --git a/Python-Scripts/Energy_ContourG+_v3_plotSurf.py b/JNLS_plotScripts/Energy_ContourG+_v3_plotSurf.py similarity index 100% rename from Python-Scripts/Energy_ContourG+_v3_plotSurf.py rename to JNLS_plotScripts/Energy_ContourG+_v3_plotSurf.py diff --git a/Python-Scripts/Energy_ContourG+_v4.py b/JNLS_plotScripts/Energy_ContourG+_v4.py similarity index 100% rename from Python-Scripts/Energy_ContourG+_v4.py rename to JNLS_plotScripts/Energy_ContourG+_v4.py diff --git a/Python-Scripts/HelperFunctions.py b/JNLS_plotScripts/HelperFunctions.py similarity index 100% rename from Python-Scripts/HelperFunctions.py rename to JNLS_plotScripts/HelperFunctions.py diff --git a/Paraview-Scripts/ParaViewSettings.txt b/JNLS_plotScripts/ParaViewSettings.txt similarity index 100% rename from Paraview-Scripts/ParaViewSettings.txt rename to JNLS_plotScripts/ParaViewSettings.txt diff --git a/Python-Scripts/PhaseDiagram.py b/JNLS_plotScripts/PhaseDiagram.py similarity index 100% rename from Python-Scripts/PhaseDiagram.py rename to JNLS_plotScripts/PhaseDiagram.py diff --git a/Python-Scripts/PhaseDiagram_Contour.py b/JNLS_plotScripts/PhaseDiagram_Contour.py similarity index 100% rename from Python-Scripts/PhaseDiagram_Contour.py rename to JNLS_plotScripts/PhaseDiagram_Contour.py diff --git a/Python-Scripts/PhaseDiagram_ContourSubPlots.py b/JNLS_plotScripts/PhaseDiagram_ContourSubPlots.py similarity index 100% rename from Python-Scripts/PhaseDiagram_ContourSubPlots.py rename to JNLS_plotScripts/PhaseDiagram_ContourSubPlots.py diff --git a/Python-Scripts/PhaseDiagram_ContourSubPlots_v2.py b/JNLS_plotScripts/PhaseDiagram_ContourSubPlots_v2.py similarity index 100% rename from Python-Scripts/PhaseDiagram_ContourSubPlots_v2.py rename to JNLS_plotScripts/PhaseDiagram_ContourSubPlots_v2.py diff --git a/Python-Scripts/PhaseDiagram_Contour_v2.py b/JNLS_plotScripts/PhaseDiagram_Contour_v2.py similarity index 100% rename from Python-Scripts/PhaseDiagram_Contour_v2.py rename to JNLS_plotScripts/PhaseDiagram_Contour_v2.py diff --git a/Python-Scripts/PhaseDiagram_CurvContourSubPlots.py b/JNLS_plotScripts/PhaseDiagram_CurvContourSubPlots.py similarity index 100% rename from Python-Scripts/PhaseDiagram_CurvContourSubPlots.py rename to JNLS_plotScripts/PhaseDiagram_CurvContourSubPlots.py diff --git a/Python-Scripts/PhaseDiagram_CurvContourSubPlots_Jumps.py b/JNLS_plotScripts/PhaseDiagram_CurvContourSubPlots_Jumps.py similarity index 100% rename from Python-Scripts/PhaseDiagram_CurvContourSubPlots_Jumps.py rename to JNLS_plotScripts/PhaseDiagram_CurvContourSubPlots_Jumps.py diff --git a/Python-Scripts/PhaseDiagram_CurvContourSubPlots_v2.py b/JNLS_plotScripts/PhaseDiagram_CurvContourSubPlots_v2.py similarity index 100% rename from Python-Scripts/PhaseDiagram_CurvContourSubPlots_v2.py rename to JNLS_plotScripts/PhaseDiagram_CurvContourSubPlots_v2.py diff --git a/Python-Scripts/PhaseDiagram_CurvContourSubPlots_v3.py b/JNLS_plotScripts/PhaseDiagram_CurvContourSubPlots_v3.py similarity index 100% rename from Python-Scripts/PhaseDiagram_CurvContourSubPlots_v3.py rename to JNLS_plotScripts/PhaseDiagram_CurvContourSubPlots_v3.py diff --git a/Python-Scripts/PhaseDiagram_PlotScript.py b/JNLS_plotScripts/PhaseDiagram_PlotScript.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScript.py rename to JNLS_plotScripts/PhaseDiagram_PlotScript.py diff --git a/Python-Scripts/PhaseDiagram_PlotScriptV2.py b/JNLS_plotScripts/PhaseDiagram_PlotScriptV2.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScriptV2.py rename to JNLS_plotScripts/PhaseDiagram_PlotScriptV2.py diff --git a/Python-Scripts/PhaseDiagram_PlotScriptV3.py b/JNLS_plotScripts/PhaseDiagram_PlotScriptV3.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScriptV3.py rename to JNLS_plotScripts/PhaseDiagram_PlotScriptV3.py diff --git a/Python-Scripts/PhaseDiagram_PlotScriptV4.py b/JNLS_plotScripts/PhaseDiagram_PlotScriptV4.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScriptV4.py rename to JNLS_plotScripts/PhaseDiagram_PlotScriptV4.py diff --git a/Python-Scripts/PhaseDiagram_PlotScriptV4_shifted.py b/JNLS_plotScripts/PhaseDiagram_PlotScriptV4_shifted.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScriptV4_shifted.py rename to JNLS_plotScripts/PhaseDiagram_PlotScriptV4_shifted.py diff --git a/Python-Scripts/PhaseDiagram_PlotScript_BetaSmallerOne.py b/JNLS_plotScripts/PhaseDiagram_PlotScript_BetaSmallerOne.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScript_BetaSmallerOne.py rename to JNLS_plotScripts/PhaseDiagram_PlotScript_BetaSmallerOne.py diff --git a/Python-Scripts/PhaseDiagram_PlotScript_Gamma0_Curvature_shifted.py b/JNLS_plotScripts/PhaseDiagram_PlotScript_Gamma0_Curvature_shifted.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScript_Gamma0_Curvature_shifted.py rename to JNLS_plotScripts/PhaseDiagram_PlotScript_Gamma0_Curvature_shifted.py diff --git a/Python-Scripts/PhaseDiagram_PlotScript_Gamma0_shifted.py b/JNLS_plotScripts/PhaseDiagram_PlotScript_Gamma0_shifted.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScript_Gamma0_shifted.py rename to JNLS_plotScripts/PhaseDiagram_PlotScript_Gamma0_shifted.py diff --git a/Python-Scripts/PhaseDiagram_PlotScript_GammaInf_Curvature_shifted.py b/JNLS_plotScripts/PhaseDiagram_PlotScript_GammaInf_Curvature_shifted.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScript_GammaInf_Curvature_shifted.py rename to JNLS_plotScripts/PhaseDiagram_PlotScript_GammaInf_Curvature_shifted.py diff --git a/Python-Scripts/PhaseDiagram_PlotScript_GammaInf_shifted.py b/JNLS_plotScripts/PhaseDiagram_PlotScript_GammaInf_shifted.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScript_GammaInf_shifted.py rename to JNLS_plotScripts/PhaseDiagram_PlotScript_GammaInf_shifted.py diff --git a/Python-Scripts/PhaseDiagram_PlotScript_ReverseDirection.py b/JNLS_plotScripts/PhaseDiagram_PlotScript_ReverseDirection.py similarity index 100% rename from Python-Scripts/PhaseDiagram_PlotScript_ReverseDirection.py rename to JNLS_plotScripts/PhaseDiagram_PlotScript_ReverseDirection.py diff --git a/Python-Scripts/PhaseDiagram_Test.py b/JNLS_plotScripts/PhaseDiagram_Test.py similarity index 100% rename from Python-Scripts/PhaseDiagram_Test.py rename to JNLS_plotScripts/PhaseDiagram_Test.py diff --git a/Python-Scripts/PhaseDiagram_backup.py b/JNLS_plotScripts/PhaseDiagram_backup.py similarity index 100% rename from Python-Scripts/PhaseDiagram_backup.py rename to JNLS_plotScripts/PhaseDiagram_backup.py diff --git a/Python-Scripts/PhaseDiagram_intermediateGamma.py b/JNLS_plotScripts/PhaseDiagram_intermediateGamma.py similarity index 100% rename from Python-Scripts/PhaseDiagram_intermediateGamma.py rename to JNLS_plotScripts/PhaseDiagram_intermediateGamma.py diff --git a/Python-Scripts/Plot-1-ParameterFamily.py b/JNLS_plotScripts/Plot-1-ParameterFamily.py similarity index 100% rename from Python-Scripts/Plot-1-ParameterFamily.py rename to JNLS_plotScripts/Plot-1-ParameterFamily.py diff --git a/Python-Scripts/Plot-Angle-Alpha_intermediateGamma.py b/JNLS_plotScripts/Plot-Angle-Alpha_intermediateGamma.py similarity index 100% rename from Python-Scripts/Plot-Angle-Alpha_intermediateGamma.py rename to JNLS_plotScripts/Plot-Angle-Alpha_intermediateGamma.py diff --git a/Python-Scripts/Plot-Angle-Alpha_intermediateGamma_v2.py b/JNLS_plotScripts/Plot-Angle-Alpha_intermediateGamma_v2.py similarity index 100% rename from Python-Scripts/Plot-Angle-Alpha_intermediateGamma_v2.py rename to JNLS_plotScripts/Plot-Angle-Alpha_intermediateGamma_v2.py diff --git a/Python-Scripts/Plot-Angle-Gamma.py b/JNLS_plotScripts/Plot-Angle-Gamma.py similarity index 100% rename from Python-Scripts/Plot-Angle-Gamma.py rename to JNLS_plotScripts/Plot-Angle-Gamma.py diff --git a/Python-Scripts/Plot-Angle-GammaV2.py b/JNLS_plotScripts/Plot-Angle-GammaV2.py similarity index 100% rename from Python-Scripts/Plot-Angle-GammaV2.py rename to JNLS_plotScripts/Plot-Angle-GammaV2.py diff --git a/Python-Scripts/Plot-Angle-GammaV2_SubPlots.py b/JNLS_plotScripts/Plot-Angle-GammaV2_SubPlots.py similarity index 100% rename from Python-Scripts/Plot-Angle-GammaV2_SubPlots.py rename to JNLS_plotScripts/Plot-Angle-GammaV2_SubPlots.py diff --git a/Python-Scripts/Plot-Angle-q3.py b/JNLS_plotScripts/Plot-Angle-q3.py similarity index 100% rename from Python-Scripts/Plot-Angle-q3.py rename to JNLS_plotScripts/Plot-Angle-q3.py diff --git a/Python-Scripts/Plot-AngleCurv-Alpha_intermediateGamma_SubPlots.py b/JNLS_plotScripts/Plot-AngleCurv-Alpha_intermediateGamma_SubPlots.py similarity index 100% rename from Python-Scripts/Plot-AngleCurv-Alpha_intermediateGamma_SubPlots.py rename to JNLS_plotScripts/Plot-AngleCurv-Alpha_intermediateGamma_SubPlots.py diff --git a/Python-Scripts/Plot-AngleCurvature-GammaV2_SubPlots.py b/JNLS_plotScripts/Plot-AngleCurvature-GammaV2_SubPlots.py similarity index 100% rename from Python-Scripts/Plot-AngleCurvature-GammaV2_SubPlots.py rename to JNLS_plotScripts/Plot-AngleCurvature-GammaV2_SubPlots.py diff --git a/Python-Scripts/Plot-Curvature-Alpha_intermediateGamma.py b/JNLS_plotScripts/Plot-Curvature-Alpha_intermediateGamma.py similarity index 100% rename from Python-Scripts/Plot-Curvature-Alpha_intermediateGamma.py rename to JNLS_plotScripts/Plot-Curvature-Alpha_intermediateGamma.py diff --git a/Python-Scripts/Plot-Curvature-Gamma.py b/JNLS_plotScripts/Plot-Curvature-Gamma.py similarity index 100% rename from Python-Scripts/Plot-Curvature-Gamma.py rename to JNLS_plotScripts/Plot-Curvature-Gamma.py diff --git a/Python-Scripts/Plot-Curvature-GammaV2.py b/JNLS_plotScripts/Plot-Curvature-GammaV2.py similarity index 100% rename from Python-Scripts/Plot-Curvature-GammaV2.py rename to JNLS_plotScripts/Plot-Curvature-GammaV2.py diff --git a/Python-Scripts/Plot-Curvature-GammaV2_SubPlots.py b/JNLS_plotScripts/Plot-Curvature-GammaV2_SubPlots.py similarity index 100% rename from Python-Scripts/Plot-Curvature-GammaV2_SubPlots.py rename to JNLS_plotScripts/Plot-Curvature-GammaV2_SubPlots.py diff --git a/Python-Scripts/Plot-Curvature-q3.py b/JNLS_plotScripts/Plot-Curvature-q3.py similarity index 100% rename from Python-Scripts/Plot-Curvature-q3.py rename to JNLS_plotScripts/Plot-Curvature-q3.py diff --git a/Python-Scripts/Plot-Energy_Axial.py b/JNLS_plotScripts/Plot-Energy_Axial.py similarity index 100% rename from Python-Scripts/Plot-Energy_Axial.py rename to JNLS_plotScripts/Plot-Energy_Axial.py diff --git a/Python-Scripts/Plot_Angle_Alpha.py b/JNLS_plotScripts/Plot_Angle_Alpha.py similarity index 100% rename from Python-Scripts/Plot_Angle_Alpha.py rename to JNLS_plotScripts/Plot_Angle_Alpha.py diff --git a/Python-Scripts/Plot_Angle_Lemma1.4-Backup.py b/JNLS_plotScripts/Plot_Angle_Lemma1.4-Backup.py similarity index 100% rename from Python-Scripts/Plot_Angle_Lemma1.4-Backup.py rename to JNLS_plotScripts/Plot_Angle_Lemma1.4-Backup.py diff --git a/Python-Scripts/Plot_Angle_Lemma1.4.py b/JNLS_plotScripts/Plot_Angle_Lemma1.4.py similarity index 100% rename from Python-Scripts/Plot_Angle_Lemma1.4.py rename to JNLS_plotScripts/Plot_Angle_Lemma1.4.py diff --git a/Python-Scripts/Plot_Angle_Lemma1.4V2.py b/JNLS_plotScripts/Plot_Angle_Lemma1.4V2.py similarity index 100% rename from Python-Scripts/Plot_Angle_Lemma1.4V2.py rename to JNLS_plotScripts/Plot_Angle_Lemma1.4V2.py diff --git a/Python-Scripts/Plot_Angle_Lemma1.4V3.py b/JNLS_plotScripts/Plot_Angle_Lemma1.4V3.py similarity index 100% rename from Python-Scripts/Plot_Angle_Lemma1.4V3.py rename to JNLS_plotScripts/Plot_Angle_Lemma1.4V3.py diff --git a/Python-Scripts/Plot_Angle_Lemma1.4V3_Transition.py b/JNLS_plotScripts/Plot_Angle_Lemma1.4V3_Transition.py similarity index 100% rename from Python-Scripts/Plot_Angle_Lemma1.4V3_Transition.py rename to JNLS_plotScripts/Plot_Angle_Lemma1.4V3_Transition.py diff --git a/Python-Scripts/Plot_Angle_Lemma1.4V3_Transition_Beta2.py b/JNLS_plotScripts/Plot_Angle_Lemma1.4V3_Transition_Beta2.py similarity index 100% rename from Python-Scripts/Plot_Angle_Lemma1.4V3_Transition_Beta2.py rename to JNLS_plotScripts/Plot_Angle_Lemma1.4V3_Transition_Beta2.py diff --git a/Python-Scripts/Plot_Angle_Lemma1.4_ChangeGamma.py b/JNLS_plotScripts/Plot_Angle_Lemma1.4_ChangeGamma.py similarity index 100% rename from Python-Scripts/Plot_Angle_Lemma1.4_ChangeGamma.py rename to JNLS_plotScripts/Plot_Angle_Lemma1.4_ChangeGamma.py diff --git a/Python-Scripts/Plot_Angle_Lemma1.4_subPlots.py b/JNLS_plotScripts/Plot_Angle_Lemma1.4_subPlots.py similarity index 100% rename from Python-Scripts/Plot_Angle_Lemma1.4_subPlots.py rename to JNLS_plotScripts/Plot_Angle_Lemma1.4_subPlots.py diff --git a/Python-Scripts/Plot_Angle_Theta.py b/JNLS_plotScripts/Plot_Angle_Theta.py similarity index 100% rename from Python-Scripts/Plot_Angle_Theta.py rename to JNLS_plotScripts/Plot_Angle_Theta.py diff --git a/Python-Scripts/Plot_Angle_Theta_intermediateGamma.py b/JNLS_plotScripts/Plot_Angle_Theta_intermediateGamma.py similarity index 100% rename from Python-Scripts/Plot_Angle_Theta_intermediateGamma.py rename to JNLS_plotScripts/Plot_Angle_Theta_intermediateGamma.py diff --git a/Python-Scripts/Plot_CurvatureLemma1.4.py b/JNLS_plotScripts/Plot_CurvatureLemma1.4.py similarity index 100% rename from Python-Scripts/Plot_CurvatureLemma1.4.py rename to JNLS_plotScripts/Plot_CurvatureLemma1.4.py diff --git a/Python-Scripts/Plot_CurvatureLemma1.4_alpha3.0.py b/JNLS_plotScripts/Plot_CurvatureLemma1.4_alpha3.0.py similarity index 100% rename from Python-Scripts/Plot_CurvatureLemma1.4_alpha3.0.py rename to JNLS_plotScripts/Plot_CurvatureLemma1.4_alpha3.0.py diff --git a/Python-Scripts/Plot_Curvature_Alpha.py b/JNLS_plotScripts/Plot_Curvature_Alpha.py similarity index 100% rename from Python-Scripts/Plot_Curvature_Alpha.py rename to JNLS_plotScripts/Plot_Curvature_Alpha.py diff --git a/Python-Scripts/Plot_Curvature_Lemma1.4V3.py b/JNLS_plotScripts/Plot_Curvature_Lemma1.4V3.py similarity index 100% rename from Python-Scripts/Plot_Curvature_Lemma1.4V3.py rename to JNLS_plotScripts/Plot_Curvature_Lemma1.4V3.py diff --git a/Python-Scripts/Plot_Curvature_TransitionArea.py b/JNLS_plotScripts/Plot_Curvature_TransitionArea.py similarity index 100% rename from Python-Scripts/Plot_Curvature_TransitionArea.py rename to JNLS_plotScripts/Plot_Curvature_TransitionArea.py diff --git a/Python-Scripts/Plot_Lemma1.4.py b/JNLS_plotScripts/Plot_Lemma1.4.py similarity index 100% rename from Python-Scripts/Plot_Lemma1.4.py rename to JNLS_plotScripts/Plot_Lemma1.4.py diff --git a/Python-Scripts/Plot_MinVec.py b/JNLS_plotScripts/Plot_MinVec.py similarity index 100% rename from Python-Scripts/Plot_MinVec.py rename to JNLS_plotScripts/Plot_MinVec.py diff --git a/Python-Scripts/Plot_MinVec_v2.py b/JNLS_plotScripts/Plot_MinVec_v2.py similarity index 100% rename from Python-Scripts/Plot_MinVec_v2.py rename to JNLS_plotScripts/Plot_MinVec_v2.py diff --git a/Python-Scripts/Plot_Prestrain_Lemma1.4.py b/JNLS_plotScripts/Plot_Prestrain_Lemma1.4.py similarity index 100% rename from Python-Scripts/Plot_Prestrain_Lemma1.4.py rename to JNLS_plotScripts/Plot_Prestrain_Lemma1.4.py diff --git a/Python-Scripts/Plot_Prestrain_Lemma1.4_Betas.py b/JNLS_plotScripts/Plot_Prestrain_Lemma1.4_Betas.py similarity index 100% rename from Python-Scripts/Plot_Prestrain_Lemma1.4_Betas.py rename to JNLS_plotScripts/Plot_Prestrain_Lemma1.4_Betas.py diff --git a/Python-Scripts/Plot_Prestrain_Lemma1.4_SubPlots.py b/JNLS_plotScripts/Plot_Prestrain_Lemma1.4_SubPlots.py similarity index 100% rename from Python-Scripts/Plot_Prestrain_Lemma1.4_SubPlots.py rename to JNLS_plotScripts/Plot_Prestrain_Lemma1.4_SubPlots.py diff --git a/Python-Scripts/Plot_aStar.py b/JNLS_plotScripts/Plot_aStar.py similarity index 100% rename from Python-Scripts/Plot_aStar.py rename to JNLS_plotScripts/Plot_aStar.py diff --git a/Python-Scripts/Plot_aStar_elliptic.py b/JNLS_plotScripts/Plot_aStar_elliptic.py similarity index 100% rename from Python-Scripts/Plot_aStar_elliptic.py rename to JNLS_plotScripts/Plot_aStar_elliptic.py diff --git a/Python-Scripts/Plot_aStar_hyperbolic.py b/JNLS_plotScripts/Plot_aStar_hyperbolic.py similarity index 100% rename from Python-Scripts/Plot_aStar_hyperbolic.py rename to JNLS_plotScripts/Plot_aStar_hyperbolic.py diff --git a/Python-Scripts/Plot_elasticQuantities.py b/JNLS_plotScripts/Plot_elasticQuantities.py similarity index 100% rename from Python-Scripts/Plot_elasticQuantities.py rename to JNLS_plotScripts/Plot_elasticQuantities.py diff --git a/Python-Scripts/Plotq12.py b/JNLS_plotScripts/Plotq12.py similarity index 100% rename from Python-Scripts/Plotq12.py rename to JNLS_plotScripts/Plotq12.py diff --git a/Python-Scripts/TestAngle.py b/JNLS_plotScripts/TestAngle.py similarity index 100% rename from Python-Scripts/TestAngle.py rename to JNLS_plotScripts/TestAngle.py diff --git a/Python-Scripts/makePlot.py b/JNLS_plotScripts/makePlot.py similarity index 100% rename from Python-Scripts/makePlot.py rename to JNLS_plotScripts/makePlot.py diff --git a/Python-Scripts/makePlotmuGamma.py b/JNLS_plotScripts/makePlotmuGamma.py similarity index 100% rename from Python-Scripts/makePlotmuGamma.py rename to JNLS_plotScripts/makePlotmuGamma.py diff --git a/Python-Scripts/mayHavetoBein_src-Folder.txt b/JNLS_plotScripts/mayHavetoBein_src-Folder.txt similarity index 100% rename from Python-Scripts/mayHavetoBein_src-Folder.txt rename to JNLS_plotScripts/mayHavetoBein_src-Folder.txt diff --git a/Python-Scripts/plot-q3-gamma.py b/JNLS_plotScripts/plot-q3-gamma.py similarity index 100% rename from Python-Scripts/plot-q3-gamma.py rename to JNLS_plotScripts/plot-q3-gamma.py diff --git a/Python-Scripts/plot_Elastic_and_PrestrainRatio.py b/JNLS_plotScripts/plot_Elastic_and_PrestrainRatio.py similarity index 100% rename from Python-Scripts/plot_Elastic_and_PrestrainRatio.py rename to JNLS_plotScripts/plot_Elastic_and_PrestrainRatio.py diff --git a/Plot-Scripts/WoodBilayer_expComparison_r022.py b/Plot-Scripts/WoodBilayer_expComparison_r022.py new file mode 100644 index 0000000000000000000000000000000000000000..f09281bfe4018346f1f5f7cf94466297dfa5bf87 --- /dev/null +++ b/Plot-Scripts/WoodBilayer_expComparison_r022.py @@ -0,0 +1,134 @@ +import numpy as np +import matplotlib.pyplot as plt +import math +import os +import subprocess +import fileinput +import re +import sys +import matplotlib as mpl +from mpl_toolkits.mplot3d import Axes3D +import matplotlib.cm as cm +import matplotlib.ticker as ticker +from matplotlib.ticker import MultipleLocator,FormatStrFormatter,MaxNLocator +import seaborn as sns +import matplotlib.colors as mcolors +# ---------------------------------------------------- +# --- Define Plot style: +# plt.style.use("seaborn-white") +# plt.style.use("seaborn-pastel") +# plt.style.use("seaborn-colorblind") +plt.style.use("seaborn") +mpl.rcParams['text.usetex'] = True +mpl.rcParams["font.family"] = "serif" +mpl.rcParams["font.size"] = "14" +mpl.rcParams['xtick.bottom'] = True +mpl.rcParams['xtick.major.size'] = 3 +mpl.rcParams['xtick.minor.size'] = 1.5 +mpl.rcParams['xtick.major.width'] = 0.75 +mpl.rcParams['ytick.left'] = True +mpl.rcParams['ytick.major.size'] = 3 +mpl.rcParams['ytick.minor.size'] = 1.5 +mpl.rcParams['ytick.major.width'] = 0.75 + +#Adjust grid: +mpl.rcParams.update({"axes.grid" : True}) # Add grid +mpl.rcParams['axes.labelpad'] = 3 +mpl.rcParams['grid.linewidth'] = 0.25 +mpl.rcParams['grid.alpha'] = 0.9 # 0.75 +mpl.rcParams['grid.linestyle'] = '-' +mpl.rcParams['grid.color'] = 'gray'#'black' +mpl.rcParams['text.latex.preamble'] = r'\usepackage{amsfonts}' # Makes Use of \mathbb possible. +# ---------------------------------------------------------------------------------------- +width = 5.79 +height = width / 1.618 # The golden ratio. + +# fig = plt.figure() #main +fig, ax = plt.subplots(figsize=(width,height)) + + + + + +input = [14.72680026, 13.64338887, 12.41305478, 11.66482931, 11.09781471, 9.435795985, 8.959564147] #moisture-content (in %) + + +kappa_sim = [1.20401338 , 1.72575251, 2.28762542 , 2.64882943 , 2.92976589 , 3.73244147 , 3.93311037 ] #kappa from Simulation +kappa_exp = [1.058078122,1.544624544, 2.317033799, 2.686043143, 2.967694189, 3.913528418, 4.262750825] #kappa from Experiment + +# compute difference: +relative_error = (np.array(kappa_sim) - np.array(kappa_exp)) / np.array(kappa_exp) +print('relative_error:', relative_error) + + +# --------------- Plot Lines + Scatter ----------------------- +line_1 = ax.plot(input, kappa_sim, # data + # color='forestgreen', # linecolor + marker='D', # each marker will be rendered as a circle + markersize=5, # marker size + # markerfacecolor='darkorange', # marker facecolor + markeredgecolor='black', # marker edgecolor + markeredgewidth=0.75, # marker edge width + # linestyle='dashdot', # line style will be dash line + linewidth=1.5, # line width + zorder=3, + label = r"$\kappa_{sim}$") + +line_2 = ax.plot(input, kappa_exp, # data + # color='orangered', # linecolor + marker='o', # each marker will be rendered as a circle + markersize=5, # marker size + # markerfacecolor='cornflowerblue', # marker facecolor + markeredgecolor='black', # marker edgecolor + markeredgewidth=0.75, # marker edge width + # linestyle='--', # line style will be dash line + linewidth=1.5, # line width + zorder=3, + alpha=0.8, # Change opacity + label = r"$\kappa_{exp}$") + +# --- Plot order line +# x = np.linspace(0.01,1/2,100) +# y = CC_L2[0]*x**2 +# OrderLine = ax.plot(x,y,linestyle='--', label=r"$\mathcal{O}(h)$") + + + +# Fix_value = 7.674124 +# l3 = plt.axhline(y = Fix_value, color = 'black', linewidth=0.75, linestyle = 'dashed') +# --------------- Set Axes ----------------------- +ax.set_title(r"ratio $r = 0.22$") # Plot - Title +# plt.xscale('log') # Use Logarithmic-Scale +# plt.yscale('log') +ax.set_xlabel(r"Wood moisture content $\omega (\%)$", labelpad=4) +ax.set_ylabel(r"Curvature $\kappa$", labelpad=4) +plt.tight_layout() + +# # --- Set Line labels +# line_labels = [r"$CC_{L_2}$",r"$CC_{H_1}$", r"$\mathcal{O}(h)$"] + +# --- Set Legend +legend = ax.legend() +# legend = fig.legend([line_1 , line_2, OrderLine], +# labels = line_labels, +# bbox_to_anchor=[0.97, 0.50], +# # bbox_to_anchor=[0.97, 0.53], +# # loc='center', +# ncol=1, # Number of columns used for legend +# # borderaxespad=0.15, # Small spacing around legend box +# frameon=True, +# prop={'size': 10}) + + +frame = legend.get_frame() +frame.set_edgecolor('black') + + +# --- Adjust left/right spacing: +# plt.subplots_adjust(right=0.81) +# plt.subplots_adjust(left=0.11) + +# ---------- Output Figure as pdf: +fig.set_size_inches(width, height) +fig.savefig('WoodBilayer_expComparison.pdf') +# plt.show() \ No newline at end of file diff --git a/Plot-Scripts/WoodBilayer_expComparison_r049.py b/Plot-Scripts/WoodBilayer_expComparison_r049.py new file mode 100644 index 0000000000000000000000000000000000000000..f09281bfe4018346f1f5f7cf94466297dfa5bf87 --- /dev/null +++ b/Plot-Scripts/WoodBilayer_expComparison_r049.py @@ -0,0 +1,134 @@ +import numpy as np +import matplotlib.pyplot as plt +import math +import os +import subprocess +import fileinput +import re +import sys +import matplotlib as mpl +from mpl_toolkits.mplot3d import Axes3D +import matplotlib.cm as cm +import matplotlib.ticker as ticker +from matplotlib.ticker import MultipleLocator,FormatStrFormatter,MaxNLocator +import seaborn as sns +import matplotlib.colors as mcolors +# ---------------------------------------------------- +# --- Define Plot style: +# plt.style.use("seaborn-white") +# plt.style.use("seaborn-pastel") +# plt.style.use("seaborn-colorblind") +plt.style.use("seaborn") +mpl.rcParams['text.usetex'] = True +mpl.rcParams["font.family"] = "serif" +mpl.rcParams["font.size"] = "14" +mpl.rcParams['xtick.bottom'] = True +mpl.rcParams['xtick.major.size'] = 3 +mpl.rcParams['xtick.minor.size'] = 1.5 +mpl.rcParams['xtick.major.width'] = 0.75 +mpl.rcParams['ytick.left'] = True +mpl.rcParams['ytick.major.size'] = 3 +mpl.rcParams['ytick.minor.size'] = 1.5 +mpl.rcParams['ytick.major.width'] = 0.75 + +#Adjust grid: +mpl.rcParams.update({"axes.grid" : True}) # Add grid +mpl.rcParams['axes.labelpad'] = 3 +mpl.rcParams['grid.linewidth'] = 0.25 +mpl.rcParams['grid.alpha'] = 0.9 # 0.75 +mpl.rcParams['grid.linestyle'] = '-' +mpl.rcParams['grid.color'] = 'gray'#'black' +mpl.rcParams['text.latex.preamble'] = r'\usepackage{amsfonts}' # Makes Use of \mathbb possible. +# ---------------------------------------------------------------------------------------- +width = 5.79 +height = width / 1.618 # The golden ratio. + +# fig = plt.figure() #main +fig, ax = plt.subplots(figsize=(width,height)) + + + + + +input = [14.72680026, 13.64338887, 12.41305478, 11.66482931, 11.09781471, 9.435795985, 8.959564147] #moisture-content (in %) + + +kappa_sim = [1.20401338 , 1.72575251, 2.28762542 , 2.64882943 , 2.92976589 , 3.73244147 , 3.93311037 ] #kappa from Simulation +kappa_exp = [1.058078122,1.544624544, 2.317033799, 2.686043143, 2.967694189, 3.913528418, 4.262750825] #kappa from Experiment + +# compute difference: +relative_error = (np.array(kappa_sim) - np.array(kappa_exp)) / np.array(kappa_exp) +print('relative_error:', relative_error) + + +# --------------- Plot Lines + Scatter ----------------------- +line_1 = ax.plot(input, kappa_sim, # data + # color='forestgreen', # linecolor + marker='D', # each marker will be rendered as a circle + markersize=5, # marker size + # markerfacecolor='darkorange', # marker facecolor + markeredgecolor='black', # marker edgecolor + markeredgewidth=0.75, # marker edge width + # linestyle='dashdot', # line style will be dash line + linewidth=1.5, # line width + zorder=3, + label = r"$\kappa_{sim}$") + +line_2 = ax.plot(input, kappa_exp, # data + # color='orangered', # linecolor + marker='o', # each marker will be rendered as a circle + markersize=5, # marker size + # markerfacecolor='cornflowerblue', # marker facecolor + markeredgecolor='black', # marker edgecolor + markeredgewidth=0.75, # marker edge width + # linestyle='--', # line style will be dash line + linewidth=1.5, # line width + zorder=3, + alpha=0.8, # Change opacity + label = r"$\kappa_{exp}$") + +# --- Plot order line +# x = np.linspace(0.01,1/2,100) +# y = CC_L2[0]*x**2 +# OrderLine = ax.plot(x,y,linestyle='--', label=r"$\mathcal{O}(h)$") + + + +# Fix_value = 7.674124 +# l3 = plt.axhline(y = Fix_value, color = 'black', linewidth=0.75, linestyle = 'dashed') +# --------------- Set Axes ----------------------- +ax.set_title(r"ratio $r = 0.22$") # Plot - Title +# plt.xscale('log') # Use Logarithmic-Scale +# plt.yscale('log') +ax.set_xlabel(r"Wood moisture content $\omega (\%)$", labelpad=4) +ax.set_ylabel(r"Curvature $\kappa$", labelpad=4) +plt.tight_layout() + +# # --- Set Line labels +# line_labels = [r"$CC_{L_2}$",r"$CC_{H_1}$", r"$\mathcal{O}(h)$"] + +# --- Set Legend +legend = ax.legend() +# legend = fig.legend([line_1 , line_2, OrderLine], +# labels = line_labels, +# bbox_to_anchor=[0.97, 0.50], +# # bbox_to_anchor=[0.97, 0.53], +# # loc='center', +# ncol=1, # Number of columns used for legend +# # borderaxespad=0.15, # Small spacing around legend box +# frameon=True, +# prop={'size': 10}) + + +frame = legend.get_frame() +frame.set_edgecolor('black') + + +# --- Adjust left/right spacing: +# plt.subplots_adjust(right=0.81) +# plt.subplots_adjust(left=0.11) + +# ---------- Output Figure as pdf: +fig.set_size_inches(width, height) +fig.savefig('WoodBilayer_expComparison.pdf') +# plt.show() \ No newline at end of file diff --git a/Python-Scripts/__pycache__/ClassifyMin.cpython-38.pyc b/Python-Scripts/__pycache__/ClassifyMin.cpython-38.pyc deleted file mode 100644 index 588d82e76cfa64b60a3158f3ab84679eda54131d..0000000000000000000000000000000000000000 Binary files a/Python-Scripts/__pycache__/ClassifyMin.cpython-38.pyc and /dev/null differ diff --git a/Python-Scripts/__pycache__/ClassifyMin_New.cpython-38.pyc b/Python-Scripts/__pycache__/ClassifyMin_New.cpython-38.pyc deleted file mode 100644 index c6e5985e988a2eb68b596d46a456974b7dbf7dce..0000000000000000000000000000000000000000 Binary files a/Python-Scripts/__pycache__/ClassifyMin_New.cpython-38.pyc and /dev/null differ diff --git a/Python-Scripts/__pycache__/HelperFunctions.cpython-38.pyc b/Python-Scripts/__pycache__/HelperFunctions.cpython-38.pyc deleted file mode 100644 index 2140cfdf8163d50eff6aae3134bf805f79d594f3..0000000000000000000000000000000000000000 Binary files a/Python-Scripts/__pycache__/HelperFunctions.cpython-38.pyc and /dev/null differ