nucleardatapy 0.2.1__py3-none-any.whl → 1.0.1__py3-none-any.whl

nucleardatapy/crust/setup_crust.py

@@ -2,13 +2,10 @@ import os
 import sys
 import math
 import numpy as np  # 1.15.0
-
-#nucleardatapy_tk = os.getenv('NUCLEARDATAPY_TK')
-#sys.path.insert(0, nucleardatapy_tk)
+from scipy.interpolate import CubicSpline
 
 import nucleardatapy as nuda
 
-
 def crust_models():
     """
     Return a list of the tables available in this toolkit for the experimental masses and
@@ -21,12 +18,13 @@ def crust_models():
     #
     if nuda.env.verb: print("\nEnter models_crust()")
     #
-    models = [ '1973-Negele-Vautherin', '2018-PCPFDDG-BSK22', '2018-PCPFDDG-BSK24', '2018-PCPFDDG-BSK25', '2018-PCPFDDG-BSK26',\
+    models = [ '1973-Negele-Vautherin', '2018-PCPFDDG-BSK22', \
+    '2018-PCPFDDG-BSK24', '2018-PCPFDDG-BSK25', '2018-PCPFDDG-BSK26',\
     '2020-MVCD-D1S', '2020-MVCD-D1M', '2020-MVCD-D1MS',\
-    '2022-crustGMRS-BSK14', '2022-crustGMRS-BSK16', '2022-crustGMRS-DHSL59', '2022-crustGMRS-DHSL69',\
-    '2022-crustGMRS-F0', '2022-crustGMRS-H1', '2022-crustGMRS-H2', '2022-crustGMRS-H3', \
-    '2022-crustGMRS-H4', '2022-crustGMRS-H5', '2022-crustGMRS-H7', '2022-crustGMRS-LNS5', \
-    '2022-crustGMRS-RATP', '2022-crustGMRS-SGII', '2022-crustGMRS-SLY5' ]
+    '2022-GMRS-BSK14', '2022-GMRS-BSK16', '2022-GMRS-DHSL59', '2022-GMRS-DHSL69',\
+    '2022-GMRS-F0', '2022-GMRS-H1', '2022-GMRS-H2', '2022-GMRS-H3', \
+    '2022-GMRS-H4', '2022-GMRS-H5', '2022-GMRS-H7', '2022-GMRS-LNS5', \
+    '2022-GMRS-RATP', '2022-GMRS-SGII', '2022-GMRS-SLY5' ]
     #
     #print('crust models available in the toolkit:',models)
     models_lower = [ item.lower() for item in models ]
@@ -77,8 +75,8 @@ class setupCrust():
             self.linestyle = 'solid'
             self.latexCite = 'JWNegele:1973'
             self.ncl = 0.17 # in fm-3
-            self.den_cgs, self.N, self.Z, self.mu_n, self.mu_p, self.n_g, self.xpn_bound, self.e2a_int2, \
-                self.e2a_int_g = np.loadtxt( file_in, usecols=(0,1,2,3,4,5,6,7,8), unpack = True )
+            self.den_cgs, self.N, self.Z, self.mu_n, self.mu_p, self.den_f, self.xpn_bound, self.e2a_int2, \
+                self.e2a_int_f = np.loadtxt( file_in, usecols=(0,1,2,3,4,5,6,7,8), unpack = True )
             self.den = self.den_cgs * 1.e-39 # in fm-3
             self.N = np.array([ int(item) for item in self.N ])
             self.Z = np.array([ int(item) for item in self.Z ])
@@ -91,12 +89,12 @@ class setupCrust():
             self.xp_bound = self.Z_bound / self.A_bound
             self.xn_bound = self.N_bound / self.A_bound
             self.I_bound = ( self.N_bound - self.Z_bound ) / self.A_bound
-            self.N_g = self.N - self.N_bound
+            self.N_f = self.N - self.N_bound
             # cluster volume and radius
             self.Vcl = 2 * self.Z_bound / ( (1-self.I_bound) * self.ncl )
             self.Rcl = ( 3 / ( 4 * nuda.cst.pi ) * self.Vcl )**nuda.cst.third
             # unbound (gas) neutrons
-            self.VWS = self.Vcl + self.N_g / self.n_g
+            self.VWS = self.Vcl + self.N_f / self.den_f
             self.RWS = ( 3 / ( 4 * nuda.cst.pi ) * self.VWS )**nuda.cst.third
             # volume fraction
             self.u = self.Vcl / self.VWS
@@ -104,21 +102,48 @@ class setupCrust():
             self.e2a_tot = self.e2a_int2 + nuda.cst.mnuc2
             self.e2a_rm = self.xn * nuda.cst.mnc2 + self.xp * ( nuda.cst.mpc2 + nuda.cst.mec2 )
             self.e2a_int = self.e2a_tot - self.e2a_rm
+            # NEP
+            self.nsat = 0.16
+            self.Esym = 32.0
+            self.Lsym = 50.0
+            self.Ksym = -100.0
+            self.Qsym = 500.0
             #
         elif '2020-mvcd' in model.lower():
             #
-            # Note: N_bound or N_g cannot be determined from the tables (Jerome).
+            # Note: N_bound or N_f cannot be determined from the tables (Jerome).
             # It is right?
             #
             if model.lower()=='2020-mvcd-d1s':
                 file_in = nuda.param.path_data+'crust/2020-MVCD-D1S.dat'
                 self.label = 'MVCD-D1S-2020'
+                # NEP
+                self.nsat = 0.16
+                self.Esym = 32.0
+                self.Lsym = 50.0
+                self.Ksym = -100.0
+                self.Qsym = 500.0
+                #
             elif model.lower()=='2020-mvcd-d1m':
                 file_in = nuda.param.path_data+'crust/2020-MVCD-D1M.dat'
                 self.label = 'MVCD-D1M-2020'
+                # NEP
+                self.nsat = 0.16
+                self.Esym = 32.0
+                self.Lsym = 50.0
+                self.Ksym = -100.0
+                self.Qsym = 500.0
+                #
             elif model.lower()=='2020-mvcd-d1ms':
                 file_in = nuda.param.path_data+'crust/2020-MVCD-D1MS.dat'
                 self.label = 'MVCD-D1M$^*$-2020'
+                # NEP
+                self.nsat = 0.16
+                self.Esym = 32.0
+                self.Lsym = 50.0
+                self.Ksym = -100.0
+                self.Qsym = 500.0
+                #
             if nuda.env.verb: print('Reads file:',file_in)
             self.ref = 'C. Mondal, X. Viñas, M. Centelles, and J.N. De, Phys. Rev. C 102, 015802 (2020).'
             self.note = "semiclassical variational Wigner-Kirkwood method along with shell and pairing corrections calculated with the Strutinsky integral method and the BCS approximation."
@@ -135,36 +160,91 @@ class setupCrust():
             self.xn = self.N / self.A
             #self.N_bound = [ int(item) for item in self.Z * self.xpn_bound ]
             #self.xn_bound = self.N_bound / self.A
-            #self.N_g = self.N - self.N_bound
+            #self.N_f = self.N - self.N_bound
             self.e2a_tot = self.e2a_int2 + nuda.cst.mnuc2_approx
             self.e2a_rm = self.xn * nuda.cst.mnc2 + self.xp * ( nuda.cst.mpc2 + nuda.cst.mec2 )
             self.e2a_int = self.e2a_tot - self.e2a_rm
             #
-            #
         elif '2018-pcpfddg' in model.lower():
             #
-            # Note: N_bound or N_g cannot be determined from the tables (Jerome).
+            # Note: N_bound or N_f cannot be determined from the tables (Jerome).
             # It is right?
             #
             if model.lower()=='2018-pcpfddg-bsk22':
+                #
                 file_in = nuda.param.path_data+'crust/2018-PCPFDDG-BSK22.dat'
                 self.label = 'PCPFDDG-BSK22-2018'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'ESkyrme', param = 'BSk22' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #self.nsat = 0.16
+                #self.Esym = 32.0
+                #self.Lsym = 50.0
+                #self.Ksym = -100.0
+                #self.Qsym = 500.0
+                #
             elif model.lower()=='2018-pcpfddg-bsk24':
+                #
                 file_in = nuda.param.path_data+'crust/2018-PCPFDDG-BSK24.dat'
                 self.label = 'PCPFDDG-BSK24-2018'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'ESkyrme', param = 'BSk24' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #self.nsat = 0.16
+                #self.Esym = 32.0
+                #self.Lsym = 50.0
+                #self.Ksym = -100.0
+                #self.Qsym = 500.0
+                #
             elif model.lower()=='2018-pcpfddg-bsk25':
+                #
                 file_in = nuda.param.path_data+'crust/2018-PCPFDDG-BSK25.dat'
                 self.label = 'PCPFDDG-BSK25-2018'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'ESkyrme', param = 'BSk25' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #self.nsat = 0.16
+                #self.Esym = 32.0
+                #self.Lsym = 50.0
+                #self.Ksym = -100.0
+                #self.Qsym = 500.0
+                #
             elif model.lower()=='2018-pcpfddg-bsk26':
+                #
                 file_in = nuda.param.path_data+'crust/2018-PCPFDDG-BSK26.dat'
                 self.label = 'PCPFDDG-BSK26-2018'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'ESkyrme', param = 'BSk26' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #self.nsat = 0.16
+                #self.Esym = 32.0
+                #self.Lsym = 50.0
+                #self.Ksym = -100.0
+                #self.Qsym = 500.0
+                #
             if nuda.env.verb: print('Reads file:',file_in)
             self.ref = 'Pearson J.M., Chamel N., Potekhin A.Y., Fantina, A.F., Ducoin C., Dutta A.K., Goriely S., MNRS 481, 2994 (2018).'
             self.note = "4th-order Extended  Thomas-Fermi (ETF) method with proton shell correction via the Strutinsky integral (SI) with Brussels-Montreal functionals."
             self.linestyle = 'dashdot'
             self.latexCite = 'MPearson:2018'
             self.ncl = 0.16 # in fm-3
-            self.den, self.Z, self.xp, self.N,  self.RWS, self.pre, self.e2a_etf, self.e2a_int, self.e2a_tot, self.mu_p, self.mu_n, self.mu_e, self.ng,self.Zcl, self.Ncl \
+            self.den, self.Z, self.xp, self.N,  self.RWS, self.pre, self.e2a_etf, self.e2a_int, self.e2a_tot, self.mu_p, self.mu_n, self.mu_e, self.den_f,self.Zcl, self.Ncl \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,5,7,8,9,10,14,15,16,23,25,27), unpack = True )
             self.den_cgs = self.den / 1.e-39 # in cm-3
             self.N = np.array([ int(item) for item in self.N ])
@@ -179,16 +259,16 @@ class setupCrust():
             self.xn_bound = self.N_bound / self.A_bound
             #
             #self.xn_bound = self.N_bound / self.A
-            #self.N_g = self.N - self.N_bound
+            #self.N_f = self.N - self.N_bound
             #self.e2a_tot = self.e2a_int2 + nuda.cst.mnuc2_approx
             self.e2a_rm = self.xn * nuda.cst.mnc2 + self.xp * ( nuda.cst.mpc2 + nuda.cst.mec2 )
             #self.e2a_int = self.e2a_tot - self.e2a_rm
             #
-        elif '2022-crustgmrs' in model.lower():
-            #
+        elif '2022-gmrs' in model.lower():
             #
-            if model.lower()=='2022-crustgmrs-bsk14':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-BSK14.dat'
+            if model.lower()=='2022-gmrs-bsk14':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-BSK14.dat'
                 self.label = 'GMRS BSK14 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.5617840312066730E-004 # in fm-3
@@ -200,8 +280,17 @@ class setupCrust():
                 self.rho_cc = 15.799976089478367 # in MeV/fm3
                 self.pre_cc = 0.32687267610704895 # in MeV/fm3
                 self.mu_n_cc = 7.6209998100288209E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-bsk16':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-BSK16.dat'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'Skyrme', param = 'BSk14' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #                
+            elif model.lower()=='2022-gmrs-bsk16':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-BSK16.dat'
                 self.label = 'GMRS BSK16 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.5282142292259004E-004 # in fm-3
@@ -213,34 +302,17 @@ class setupCrust():
                 self.rho_cc = 16.920900617363277 # in MeV/fm3
                 self.pre_cc = 0.36795626298336570 # in MeV/fm3
                 self.mu_n_cc = 8.4609997888086361E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-dhsl59':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-DHSL59.dat'
-                self.label = 'GMRS DHSL59 2022'
-                # Outer-Inner Crust (OIC) Transition :
-                self.nb_oic = 2.6651916429173218E-004 # in fm-3
-                self.rho_oic = 7.7840639496076998 # in MeV/fm3
-                self.pre_oic = 6.3684106061817061E-004 # in MeV/fm3
-                self.mu_n_oic = 2.8095904260657669E-004 # in MeV
-                # Crust-Core Transition:
-                self.nb_cc = 7.2109998203862921E-002 # in fm-3
-                self.rho_cc = 17.733669529186933 # in MeV/fm3
-                self.pre_cc = 0.33617646422062142 # in MeV/fm3
-                self.mu_n_cc = 7.2109998203862921E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-dhsl69':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-DHSL69.dat'
-                self.label = 'GMRS DHSL69 2022'
-                # Outer-Inner Crust (OIC) Transition :
-                self.nb_oic = 2.4301212474202996E-004 # in fm-3
-                self.rho_oic = 7.3077129271105594 # in MeV/fm3
-                self.pre_oic = 5.6022465054447420E-004 # in MeV/fm3
-                self.mu_n_oic = 2.5617840312066730E-004 # in MeV
-                # Crust-Core Transition:
-                self.nb_cc = 7.3209998176074584E-002 # in fm-3
-                self.rho_cc = 17.399615979167670 # in MeV/fm3
-                self.pre_cc = 0.38035277580973315 # in MeV/fm3
-                self.mu_n_cc = 7.3209998176074584E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-f0':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-F0.dat'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'Skyrme', param = 'BSk16' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-f0':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-F0.dat'
                 self.label = 'GMRS F0 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.4950843283419027E-004 # in fm-3
@@ -252,8 +324,105 @@ class setupCrust():
                 self.rho_cc = 18.078177464065167 # in MeV/fm3
                 self.pre_cc = 0.33181818756433845 # in MeV/fm3
                 self.mu_n_cc = 8.3309997920927123E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-h1':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-H1.dat'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'Skyrme', param = 'F0' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-lns5':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-LNS5.dat'
+                self.label = 'GMRS LNS5 2022'
+                # Outer-Inner Crust (OIC) Transition :
+                self.nb_oic = 2.6651916429173218E-004 # in fm-3
+                self.rho_oic = 7.2220830810240075 # in MeV/fm3
+                self.pre_oic = 5.3768304050759832E-004 # in MeV/fm3
+                self.mu_n_oic = 2.8095904260657669E-004 # in MeV
+                # Crust-Core Transition:
+                self.nb_cc = 7.0409998246808533E-002 # in fm-3
+                self.rho_cc = 14.391278079363289 # in MeV/fm3
+                self.pre_cc = 0.26627562388273884 # in MeV/fm3
+                self.mu_n_cc = 7.0409998246808533E-002 # in MeV
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'Skyrme', param = 'LNS5' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-ratp':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-RATP.dat'
+                self.label = 'GMRS RATP 2022'
+                # Outer-Inner Crust (OIC) Transition :
+                self.nb_oic = 2.5617840312066730E-004 # in fm-3
+                self.rho_oic = 7.1702995055472227 # in MeV/fm3
+                self.pre_oic = 5.1984846488072468E-004 # in MeV/fm3
+                self.mu_n_oic = 2.7005802403942604E-004 # in MeV
+                # Crust-Core Transition:
+                self.nb_cc = 8.6009997852719386E-002 # in fm-3
+                self.rho_cc = 16.557394274307612 # in MeV/fm3
+                self.pre_cc = 0.35277408994086884 # in MeV/fm3
+                self.mu_n_cc = 8.6009997852719386E-002 # in MeV
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'Skyrme', param = 'RATP' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-sgii':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-SGII.dat'
+                self.label = 'GMRS SGII 2022'
+                # Outer-Inner Crust (OIC) Transition :
+                self.nb_oic = 2.6651916429173218E-004 # in fm-3
+                self.rho_oic = 7.2454048591257214 # in MeV/fm3
+                self.pre_oic = 5.3291857700309511E-004 # in MeV/fm3
+                self.mu_n_oic = 2.8095904260657669E-004 # in MeV
+                # Crust-Core Transition:
+                self.nb_cc = 6.5309998375645370E-002 # in fm-3
+                self.rho_cc = 13.413876317015074 # in MeV/fm3
+                self.pre_cc = 0.20198467236572187 # in MeV/fm3
+                self.mu_n_cc = 6.5309998375645370E-002 # in MeV
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'Skyrme', param = 'SGII' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-sly5':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-SLY5.dat'
+                self.label = 'GMRS SLy5 2022'
+                # Outer-Inner Crust (OIC) Transition :
+                self.nb_oic = 2.4623885640591057E-004 # in fm-3
+                self.rho_oic = 7.0872886477160133 # in MeV/fm3
+                self.pre_oic = 5.1240271689332565E-004 # in MeV/fm3
+                self.mu_n_oic = 2.5957995753211628E-004 # in MeV
+                # Crust-Core Transition:
+                self.nb_cc = 7.6309998097761997E-002 # in fm-3
+                self.rho_cc = 17.103178025699933 # in MeV/fm3
+                self.pre_cc = 0.31728157118252842 # in MeV/fm3
+                self.mu_n_cc = 7.6309998097761997E-002 # in MeV
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'Skyrme', param = 'SLY5' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-h1':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-H1.dat'
                 self.label = 'GMRS H1 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.5957995753211628E-004 # in fm-3
@@ -265,8 +434,17 @@ class setupCrust():
                 self.rho_cc = 17.803660783830789 # in MeV/fm3
                 self.pre_cc = 0.48159809254574409 # in MeV/fm3
                 self.mu_n_cc = 9.5909997602624350E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-h2':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-H2.dat'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'xEFT', param = 'H1MM' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-h2':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-H2.dat'
                 self.label = 'GMRS H2 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.4301212474202996E-004 # in fm-3
@@ -278,8 +456,17 @@ class setupCrust():
                 self.rho_cc = 17.632170792314291 # in MeV/fm3
                 self.pre_cc = 0.48032175761400209 # in MeV/fm3
                 self.mu_n_cc = 9.2909997678410725E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-h3':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-H3.dat'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'xEFT', param = 'H2MM' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-h3':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-H3.dat'
                 self.label = 'GMRS H3 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.4623885640591057E-004 # in fm-3
@@ -291,8 +478,17 @@ class setupCrust():
                 self.rho_cc = 17.236262111228385 # in MeV/fm3
                 self.pre_cc = 0.40705940455120337 # in MeV/fm3
                 self.mu_n_cc = 8.4509997890612573E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-h4':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-H4.dat'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'xEFT', param = 'H3MM' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-h4':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-H4.dat'
                 self.label = 'GMRS H4 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.5282142292259004E-004 # in fm-3
@@ -304,8 +500,17 @@ class setupCrust():
                 self.rho_cc = 18.131463559875652 # in MeV/fm3
                 self.pre_cc = 0.47616516763123967 # in MeV/fm3
                 self.mu_n_cc = 9.0609997736513612E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-h5':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-H5.dat'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'xEFT', param = 'H4MM' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-h5':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-H5.dat'
                 self.label = 'GMRS H5 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.8468963604916567E-004 # in fm-3
@@ -317,8 +522,17 @@ class setupCrust():
                 self.rho_cc = 19.069132247958592 # in MeV/fm3
                 self.pre_cc = 0.46337573665856840 # in MeV/fm3
                 self.mu_n_cc = 8.7009997827457261E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-h7':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-H7.dat'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'xEFT', param = 'H5MM' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-h7':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-H7.dat'
                 self.label = 'GMRS H7 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 3.2914459584803760E-004 # in fm-3
@@ -330,64 +544,62 @@ class setupCrust():
                 self.rho_cc = 19.885261960955020 # in MeV/fm3
                 self.pre_cc = 0.48143960493062543 # in MeV/fm3
                 self.mu_n_cc = 8.3109997925979548E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-lns5':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-LNS5.dat'
-                self.label = 'GMRS LNS5 2022'
-                # Outer-Inner Crust (OIC) Transition :
-                self.nb_oic = 2.6651916429173218E-004 # in fm-3
-                self.rho_oic = 7.2220830810240075 # in MeV/fm3
-                self.pre_oic = 5.3768304050759832E-004 # in MeV/fm3
-                self.mu_n_oic = 2.8095904260657669E-004 # in MeV
-                # Crust-Core Transition:
-                self.nb_cc = 7.0409998246808533E-002 # in fm-3
-                self.rho_cc = 14.391278079363289 # in MeV/fm3
-                self.pre_cc = 0.26627562388273884 # in MeV/fm3
-                self.mu_n_cc = 7.0409998246808533E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-ratp':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-RATP.dat'
-                self.label = 'GMRS RATP 2022'
-                # Outer-Inner Crust (OIC) Transition :
-                self.nb_oic = 2.5617840312066730E-004 # in fm-3
-                self.rho_oic = 7.1702995055472227 # in MeV/fm3
-                self.pre_oic = 5.1984846488072468E-004 # in MeV/fm3
-                self.mu_n_oic = 2.7005802403942604E-004 # in MeV
-                # Crust-Core Transition:
-                self.nb_cc = 8.6009997852719386E-002 # in fm-3
-                self.rho_cc = 16.557394274307612 # in MeV/fm3
-                self.pre_cc = 0.35277408994086884 # in MeV/fm3
-                self.mu_n_cc = 8.6009997852719386E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-sgii':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-SGII.dat'
-                self.label = 'GMRS SGII 2022'
+                # NEP
+                nep = nuda.matter.setupNEP( model = 'xEFT', param = 'H7MM' )
+                self.nsat = nep.nsat
+                self.Esym = nep.Esym
+                self.Lsym = nep.Lsym
+                self.Ksym = nep.Ksym
+                self.Qsym = nep.Qsym
+                #
+            elif model.lower()=='2022-gmrs-dhsl59':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-DHSL59.dat'
+                self.label = 'GMRS DHSL59 2022'
                 # Outer-Inner Crust (OIC) Transition :
                 self.nb_oic = 2.6651916429173218E-004 # in fm-3
-                self.rho_oic = 7.2454048591257214 # in MeV/fm3
-                self.pre_oic = 5.3291857700309511E-004 # in MeV/fm3
+                self.rho_oic = 7.7840639496076998 # in MeV/fm3
+                self.pre_oic = 6.3684106061817061E-004 # in MeV/fm3
                 self.mu_n_oic = 2.8095904260657669E-004 # in MeV
                 # Crust-Core Transition:
-                self.nb_cc = 6.5309998375645370E-002 # in fm-3
-                self.rho_cc = 13.413876317015074 # in MeV/fm3
-                self.pre_cc = 0.20198467236572187 # in MeV/fm3
-                self.mu_n_cc = 6.5309998375645370E-002 # in MeV
-            elif model.lower()=='2022-crustgmrs-sly5':
-                file_in = nuda.param.path_data+'crust/2022-crustGMRS-SLY5.dat'
-                self.label = 'GMRS SLy5 2022'
+                self.nb_cc = 7.2109998203862921E-002 # in fm-3
+                self.rho_cc = 17.733669529186933 # in MeV/fm3
+                self.pre_cc = 0.33617646422062142 # in MeV/fm3
+                self.mu_n_cc = 7.2109998203862921E-002 # in MeV
+                # NEP
+                self.nsat = 0.16
+                self.Esym = 32.0
+                self.Lsym = 59.0
+                self.Ksym = -100.0
+                self.Qsym = 500.0
+                #
+            elif model.lower()=='2022-gmrs-dhsl69':
+                #
+                file_in = nuda.param.path_data+'crust/2022-GMRS-DHSL69.dat'
+                self.label = 'GMRS DHSL69 2022'
                 # Outer-Inner Crust (OIC) Transition :
-                self.nb_oic = 2.4623885640591057E-004 # in fm-3
-                self.rho_oic = 7.0872886477160133 # in MeV/fm3
-                self.pre_oic = 5.1240271689332565E-004 # in MeV/fm3
-                self.mu_n_oic = 2.5957995753211628E-004 # in MeV
+                self.nb_oic = 2.4301212474202996E-004 # in fm-3
+                self.rho_oic = 7.3077129271105594 # in MeV/fm3
+                self.pre_oic = 5.6022465054447420E-004 # in MeV/fm3
+                self.mu_n_oic = 2.5617840312066730E-004 # in MeV
                 # Crust-Core Transition:
-                self.nb_cc = 7.6309998097761997E-002 # in fm-3
-                self.rho_cc = 17.103178025699933 # in MeV/fm3
-                self.pre_cc = 0.31728157118252842 # in MeV/fm3
-                self.mu_n_cc = 7.6309998097761997E-002 # in MeV
+                self.nb_cc = 7.3209998176074584E-002 # in fm-3
+                self.rho_cc = 17.399615979167670 # in MeV/fm3
+                self.pre_cc = 0.38035277580973315 # in MeV/fm3
+                self.mu_n_cc = 7.3209998176074584E-002 # in MeV
+                # NEP
+                self.nsat = 0.16
+                self.Esym = 32.0
+                self.Lsym = 69.0
+                self.Ksym = -100.0
+                self.Qsym = 500.0
+                #
             if nuda.env.verb: print('Reads file:',file_in)
             self.ref = 'G. Grams, J. Margueron, R. Somasundaram, and S. Reddy, EPJA 58, 56 (2022).'
             self.note = "."
             self.linestyle = 'dotted'
             self.latexCite = 'GGrams:2022'
-            self.den, self.Acl, self.Zcl, self.ncl, self.xe, self.ng, self.VWS, self.e2a_int2, self.pre, self.mu_n, self.mu_p \
+            self.den, self.Acl, self.Zcl, self.ncl, self.xe, self.den_f, self.VWS, self.e2a_int2, self.pre, self.mu_n, self.mu_p \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4,5,6,7,8,9,10), unpack = True )
             self.den_cgs = self.den / 1.e-39 # in cm-3
             # bound nucleons
@@ -404,11 +616,11 @@ class setupCrust():
             self.u = self.Vcl / self.VWS
             # unbound (gas) neutrons
             self.RWS = ( 3 / ( 4 * nuda.cst.pi ) * self.VWS )**nuda.cst.third
-            self.N_g = self.ng * ( self.VWS - self.Vcl )
+            self.N_f = self.den_f * ( self.VWS - self.Vcl )
             # total number of nucleons
             self.Z = self.Z_bound
-            self.N = self.N_bound + self.N_g
-            self.A = self.A_bound + self.N_g
+            self.N = self.N_bound + self.N_f
+            self.A = self.A_bound + self.N_f
             self.xn = self.N / self.A
             self.xp = self.Z / self.A
             # energy
@@ -417,6 +629,26 @@ class setupCrust():
             self.e2a_int = self.e2a_tot - self.e2a_rm
             # electrons
             self.mu_e = self.mu_n - self.mu_p
+            #
+        #
+        # For all models:
+        #
+        self.eps_tot = self.e2a_tot * self.den
+        self.eps_rm = self.e2a_rm * self.den
+        self.eps_int = self.e2a_int * self.den
+        # compute the pressure from the derivative of the total energy per nucleon
+        x = np.insert(self.den, 0, 0.0)
+        y = np.insert(self.e2a_tot, 0, 0.0)
+        cs_e2a_tot = CubicSpline(x, y)
+        self.pre_tot = np.array( self.den**2 * cs_e2a_tot(self.den, 1) )
+        # enthalpy
+        self.h2a_tot = self.e2a_tot + self.pre_tot / self.den
+        # sound speed in the crust
+        x = np.insert(self.den, 0, 0.0)
+        y = np.insert(self.pre_tot, 0, 0.0)
+        cs_pre_tot = CubicSpline(x, y)
+        self.cs2_tot = cs_pre_tot(self.den, 1) / self.h2a_tot
+        self.cs2_tot = np.abs( self.cs2_tot ) # this shows that the second derivative is not well calculated
     #
     def print_outputs( self ):
        """
@@ -427,7 +659,7 @@ class setupCrust():
        if nuda.env.verb: print("Enter print_outputs()")
        #
        print("- Print output:")
-       print("   modcrust:",self.modcrust)
+       print("   model:",self.model)
        print("   ref:     ",self.ref)
        print("   label:   ",self.label)
        print("   note:    ",self.note)
@@ -436,17 +668,17 @@ class setupCrust():
        if self.Z is not None: print(f"   Z: {self.Z}")
        if self.N is not None: print(f"   N: {self.N}")
        if self.N_bound is not None: print(f"   N_bound: {self.N_bound}")
-       if self.N_g is not None: print(f"   N_g: {self.N_g}")
+       if self.N_f is not None: print(f"   N_f: {self.N_f}")
        if self.mu_n is not None: print(f"   mu_n(MeV): {self.mu_n}")
        if self.mu_p is not None: print(f"   mu_p(MeV): {self.mu_p}")
-       if self.den_g is not None: print(f"   den_g(fm-3): {self.den_g}")
+       if self.den_f is not None: print(f"   den_f(fm-3): {self.den_f}")
        if self.RWS is not None: print(f"   RWS(fm): {np.round(self.RWS,3)}")
        if self.xpn_bound is not None: print(f"   xpn_bound: {self.xpn_bound}")
        if self.e2a_tot is not None: print(f"   e2a_tot(MeV): {np.round(self.e2a_tot,3)}")
        if self.e2a_rm is not None: print(f"   e2a_rm(MeV): {np.round(self.e2a_rm,3)}")
        if self.e2a_int2 is not None: print(f"   e2a_int2(MeV): {np.round(self.e2a_int2,3)}")
        if self.e2a_int is not None: print(f"   e2a_int(MeV): {np.round(self.e2a_int,3)}")
-       if self.e2a_int_g is not None: print(f"   e2a_int_g(MeV): {np.round(self.e2a_int_g,3)}")
+       if self.e2a_int_f is not None: print(f"   e2a_int_f(MeV): {np.round(self.e2a_int_f,3)}")
        #
        if nuda.env.verb: print("Exit print_outputs()")
        #
@@ -467,10 +699,10 @@ class setupCrust():
         self.Z_bound = None
         #: Attribute N_bound (number of neutrons in the cluster).
         self.N_bound = None
-        #: Attribute N_g (number of neutrons in the gas).
-        self.N_g = None
-        #: Attribute n_g (neutron density in the gas).
-        self.n_g = None
+        #: Attribute N_f (number of free neutrons).
+        self.N_f = None
+        #: Attribute den_f (free neutron density).
+        self.den_f = None
         #: Attribute A (total number of nucleons of the WS cell).
         self.A = None
         #: Attribute Z (total number of protons of the WS cell).
@@ -493,8 +725,6 @@ class setupCrust():
         self.mu_n = None
         #: Attribute the proton chemical potential (in MeV).
         self.mu_p = None
-        #: Attribute the approximate density of neutron in the gas (in fm-3).
-        self.den_g = None
         #: Attribute the radius of the cluster (in fm).
         self.Rcl = None
         #: Attribute the radius of the WS cell (in fm).
@@ -505,8 +735,16 @@ class setupCrust():
         self.e2a_int2 = None
         #: Attribute the internal energy (in MeV).
         self.e2a_int = None
+        #: Attribute the total internal energy (in MeV).
+        self.e2a_tot = None
         #: Attribute the internal energy of the gas component (in MeV).
-        self.e2a_int_g = None
+        self.e2a_int_f = None
+        #: Attribute the rest mass energy density (in MeV fm3).
+        self.eps_rm = None
+        #: Attribute the internal energy density (in MeV fm3).
+        self.eps_int = None
+        #: Attribute the total energy density (in MeV fm3).
+        self.eps_tot = None
         #
         self.ref = None
         self.note = None