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

nucleardatapy/matter/{setup_nep_dist.py → setup_nep_stat_models.py}

@@ -5,13 +5,13 @@ from scipy.interpolate import CubicSpline
 
 import nucleardatapy as nuda
 
-class setupNEPDist():
+class setupNEPStat_models():
     """
     Instantiate the object with results based on phenomenological\
     interactions and choosen by the toolkit practitioner. \
     This choice is defined in the variables `model` and `param`.
 
-    :param model: Fix the name of model: 'Skyrme', 'NLRH', \
+    :param model: Fix the name of model: 'Skyrme', 'GSkyrme', 'NLRH', \
     'DDRH', 'DDRHF'. Default value: 'Skyrme'.
     :type model: str, optional. 
     :param param: Fix the parameterization associated to model. \
@@ -23,15 +23,15 @@ class setupNEPDist():
     #
     def __init__( self, models = [ 'Skyrme' ] ):
         #
-        if nuda.env.verb: print("\nEnter setupNEPDist()")
+        if nuda.env.verb: print("\nEnter setupNEPStat_models()")
         #
         #: Attribute model.
         self.models = models
         if nuda.env.verb: print("models:",models)
         #
-        self = setupNEPDist.init_self( self )
+        self = setupNEPStat_models.init_self( self )
         #
-        models, models_lower = nuda.matter.nep_models( )
+        models_tmp, models_lower = nuda.matter.nep_models( )
         #
         for model in models:
             #
@@ -41,7 +41,7 @@ class setupNEPDist():
                 print('-- Exit the code --')
                 exit()
             #
-            dist = nuda.matter.setupNEPModelDist( model )
+            dist = nuda.matter.setupNEPStat_model( model )
             #        
             if dist.nep:
                 if dist.params: self.params.extend( dist.params ); 
@@ -57,6 +57,7 @@ class setupNEPDist():
                 if dist.Zsym: self.Zsym.extend( dist.Zsym ); 
                 if dist.kappas: self.kappas.extend( dist.kappas ); 
                 if dist.kappav: self.kappav.extend( dist.kappav ); 
+                if dist.kappasat: self.kappasat.extend( dist.kappasat ); 
                 if dist.kappasym: self.kappasym.extend( dist.kappasym ); 
                 if dist.msat: self.msat.extend( dist.msat ); 
                 if dist.Dmsat: self.Dmsat.extend( dist.Dmsat ); 
@@ -72,6 +73,7 @@ class setupNEPDist():
         self.Zsym = np.array( self.Zsym, dtype = float )
         self.kappas = np.array( self.kappas, dtype = float )
         self.kappav = np.array( self.kappav, dtype = float )
+        self.kappasat = np.array( self.kappasat, dtype = float )
         self.kappasym = np.array( self.kappasym, dtype = float )
         self.msat = np.array( self.msat, dtype = float )
         self.Dmsat = np.array( self.Dmsat, dtype = float )
@@ -90,11 +92,12 @@ class setupNEPDist():
         self.Zsym_mean = np.mean(self.Zsym); self.Zsym_std = np.std(self.Zsym)
         self.kappas_mean = np.mean(self.kappas); self.kappas_std = np.std(self.kappas)
         self.kappav_mean = np.mean(self.kappav); self.kappav_std = np.std(self.kappav)
+        self.kappasat_mean = np.mean(self.kappasat); self.kappasat_std = np.std(self.kappasat)
         self.kappasym_mean = np.mean(self.kappasym); self.kappasym_std = np.std(self.kappasym)
         self.msat_mean = np.mean(self.msat);   self.msat_std = np.std(self.msat)
         self.Dmsat_mean = np.mean(self.Dmsat); self.Dmsat_std = np.std(self.Dmsat)
         #
-        if nuda.env.verb: print("Exit SetupNEPDist()")
+        if nuda.env.verb: print("Exit SetupNEPStat_models()")
     #
     def print_outputs( self ):
         """
@@ -132,6 +135,7 @@ class setupNEPDist():
         print(f" Zsym_mean: {self.Zsym_mean:.0f} +- {self.Zsym_std:.0f}")
         print(f" kappas_mean: {self.kappas_mean:.2f} +- {self.kappas_std:.2f}")
         print(f" kappav_mean: {self.kappav_mean:.2f} +- {self.kappav_std:.2f}")
+        print(f" kappasat_mean: {self.kappasat_mean:.2f} +- {self.kappasat_std:.2f}")
         print(f" kappasym_mean: {self.kappasym_mean:.2f} +- {self.kappasym_std:.2f}")
         print(f" msat_mean: {self.msat_mean:.2f} +- {self.msat_std:.2f}")
         print(f" Dmsat_mean: {self.Dmsat_mean:.2f} +- {self.Dmsat_std:.2f}")
@@ -179,7 +183,7 @@ class setupNEPDist():
         self.params = []
         self.nsat = []; self.Esat = []; self.Ksat = []; self.Qsat = []; self.Zsat = []
         self.Esym = []; self.Lsym = []; self.Ksym = []; self.Qsym = []; self.Zsym = []
-        self.kappas = []; self.kappav = []; self.kappasym = []
+        self.kappas = []; self.kappav = []; self.kappasat = []; self.kappasym = []
         self.msat = []; self.Dmsat = []; 
         #
         if nuda.env.verb: print("Exit init_self()")

nucleardatapy/matter/setup_pheno.py

@@ -3,9 +3,6 @@ import sys
 import numpy as np  # 1.15.0
 from scipy.interpolate import CubicSpline
 
-#nucleardatapy_tk = os.getenv('NUCLEARDATAPY_TK')
-#sys.path.insert(0, nucleardatapy_tk)
-
 import nucleardatapy as nuda
 
 def pheno_models():
@@ -18,7 +15,9 @@ def pheno_models():
     #
     if nuda.env.verb: print("\nEnter pheno_models()")
     #
-    models = [ 'Skyrme', 'ESkyrme', 'Gogny', 'Fayans', 'NLRH', 'DDRH', 'DDRHF' ]
+    # models = [ 'Skyrme', 'ESkyrme', 'Gogny', 'Fayans', 'NLRH', 'DDRH', 'DDRHF' ]
+    models = [ 'Skyrme', 'ESkyrme', 'NLRH', 'DDRH', 'DDRHF' ]
+
     #print('Phenomenological models available in the toolkit:',models)
     models_lower = [ item.lower() for item in models ]
     #
@@ -36,12 +35,12 @@ def pheno_params( model ):
     :type model: str.
     :return: The list of parametrizations. \
     If `models` == 'Skyrme': 'BSK14', \
-    'BSK16', 'BSK17', 'BSK27', 'F-', 'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', \
+    'BSK16', 'BSK17', 'BSK27','BSkG1', 'BSkG2', 'F-', 'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', \
     'NRAPR', 'RATP', 'SAMI', 'SGII', 'SIII', 'SKGSIGMA', 'SKI2', 'SKI4', 'SKMP', \
     'SKMS', 'SKO', 'SKOP', 'SKP', 'SKRSIGMA', 'SKX', 'Skz2', 'SLY4', 'SLY5', \
     'SLY230A', 'SLY230B', 'SV', 'T6', 'T44', 'UNEDF0', 'UNEDF1'. \
     If `models` == 'ESkyrme': 'BSk22', 'BSk24', 'BSk25', 'BSk26', 'BSk31', 'BSk32', \
-    'BSkG1', 'BSkG2', 'BSkG3'. \
+     'BSkG3','BSkG4' . \
     If `models` == 'Fayans': 'SLy4', 'SkM*', 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)', \
     'SV-min', 'SV-bas', 'SV-K218', 'SV-K226', 'SV-K241', 'SV-mas07', 'SV-mas08', 'SV-mas10',
     'SV-sym28', 'SV-sym32', 'SV-sym34', 'SV-kap00', 'SV-kap20', 'SV-kap60'.
@@ -55,18 +54,16 @@ def pheno_params( model ):
     #
     #print('For model:',model)
     if model.lower() == 'skyrme':
-        params = [ 'BSK14', 'BSK16', 'BSK17', 'BSK27', 'F-', \
+        params = [ 'BSK14', 'BSK16', 'BSK17', 'BSK27', 'BSkG1', 'BSkG2', 'F-', \
             'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', 'NRAPR', 'RATP', \
             'SAMI', 'SGII', 'SIII', 'SKGSIGMA', 'SKI2', 'SKI4', 'SKMP', \
             'SKMS', 'SKO', 'SKOP', 'SKP', 'SKRSIGMA', 'SKX', 'Skz2', \
             'SLY4', 'SLY5', 'SLY230A', 'SLY230B', 'SV', 'T6', 'T44', \
             'UNEDF0', 'UNEDF1' ]
     elif model.lower() == 'eskyrme':
-        params = [ 'BSk22', 'BSk24', 'BSk25', 'BSk26', 'BSk31', 'BSk32', 'BSkG1', 'BSkG2', 'BSkG3' ]
+        params = [ 'BSk22', 'BSk24', 'BSk25', 'BSk26', 'BSk31', 'BSk32',  'BSkG3','BSkG4' ]
     elif model.lower() == 'fayans':
-        params = [ 'SLy4', 'SkM*', 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)', \
-            'SV-min', 'SV-bas', 'SV-K218', 'SV-K226', 'SV-K241', 'SV-mas07', 'SV-mas08', 'SV-mas10',\
-            'SV-sym28', 'SV-sym32', 'SV-sym34', 'SV-kap00', 'SV-kap20', 'SV-kap60' ]
+        params = [ 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)' ]
     elif model.lower() == 'gogny':
         params = [ 'D1S', 'D1', 'D250', 'D260', 'D280', 'D300' ]
     elif model.lower() == 'nlrh':
@@ -90,13 +87,17 @@ class setupPheno():
     This choice is defined in the variables `model` and `param`.
 
     If `models` == 'Skyrme', `param` can be: 'BSK14', \
-    'BSK16', 'BSK17', 'BSK27', 'F-', 'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', \
+    'BSK16', 'BSK17', 'BSK27', 'BSkG1', 'BSkG2','F-', 'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', \
     'NRAPR', 'RATP', 'SAMI', 'SGII', 'SIII', 'SKGSIGMA', 'SKI2', 'SKI4', 'SKMP', \
     'SKMS', 'SKO', 'SKOP', 'SKP', 'SKRSIGMA', 'SKX', 'Skz2', 'SLY4', 'SLY5', \
     'SLY230A', 'SLY230B', 'SV', 'T6', 'T44', 'UNEDF0', 'UNEDF1'. 
 
     If `models` == 'ESkyrme', `param` can be: 'BSk22', 'BSk24', 'BSk25', \
-    'BSk26', 'BSk31', 'BSk32', 'BSkG1', 'BSkG2', 'BSkG3'.
+    'BSk26', 'BSk31', 'BSk32', 'BSkG3','BSkG4' .
+
+    If `models` == 'Fayans', `param` can be: 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)' \
+
+    If `models` == 'Gogny', `param` can be: 'D1S', 'D1', 'D250', 'D260', 'D280', 'D300' \
 
     If `models` == 'NLRH', `param` can be: 'NL-SH', 'NL3', 'NL3II', 'PK1', 'PK1R', 'TM1'. 
 
@@ -139,6 +140,10 @@ class setupPheno():
         #
         params, params_lower = pheno_params( model = model )
         #
+        self.nm_rmass = nuda.cst.mnc2
+        self.sm_rmass = 0.5 * ( nuda.cst.mnc2 + nuda.cst.mpc2 )
+        #self.rmass = (1.0-self.xpr) * nuda.cst.mnc2 + self.xpr * nuda.cst.mpc2
+        #
         if param.lower() not in params_lower:
             print('The param set ',param,' is not in the list of param.')
             print('list of param:',params)
@@ -157,9 +162,36 @@ class setupPheno():
             self.label = 'SKY-'+param
             #: Attribute providing additional notes about the data.
             self.note = "write here notes about this EOS."
-            self.sm_den, self.sm_kfn, self.sm_e2a, self.sm_pre, a, self.sm_cs2 = np.loadtxt( file_in1, usecols=(0,1,2,3,4,5), comments='#', unpack = True )
-            self.nm_den, self.nm_kfn, self.nm_e2a, self.nm_pre, a, self.nm_cs2 = np.loadtxt( file_in2, usecols=(0,1,2,3,4,5), comments='#', unpack = True )
+            self.sm_den, self.sm_kfn, self.sm_e2a_int, self.sm_pre, a, self.sm_cs2 = np.loadtxt( file_in1, usecols=(0,1,2,3,4,5), comments='#', unpack = True )
+            self.nm_den, self.nm_kfn, self.nm_e2a_int, self.nm_pre, a, self.nm_cs2 = np.loadtxt( file_in2, usecols=(0,1,2,3,4,5), comments='#', unpack = True )
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_eps = self.nm_e2a * self.nm_den
             self.sm_kf = self.sm_kfn
+            # pressure in SM
+            x = np.insert( self.sm_den, 0, 0.0 )
+            y = np.insert( self.sm_e2a_int, 0, 0.0 )
+            cs_sm_e2a = CubicSpline( x, y )
+            self.sm_pre = np.array( self.sm_den**2 * cs_sm_e2a( self.sm_den, 1) )
+            # pressure in NM
+            x = np.insert( self.nm_den, 0, 0.0 )
+            y = np.insert( self.nm_e2a_int, 0, 0.0 )
+            cs_nm_e2a = CubicSpline( x, y )
+            self.nm_pre = np.array( self.nm_den**2 * cs_nm_e2a( self.nm_den, 1) )
+            # enthalpy
+            self.sm_h2a = self.sm_e2a + self.sm_pre / self.sm_den
+            self.nm_h2a = self.nm_e2a + self.nm_pre / self.nm_den
+            # sound speed in SM
+            x = np.insert(self.sm_den, 0, 0.0)
+            y = np.insert(self.sm_pre, 0, 0.0)
+            cs_sm_pre = CubicSpline(x, y)
+            self.sm_cs2 = cs_sm_pre(self.sm_den, 1) / self.sm_h2a
+            # sound speed in NM
+            x = np.insert(self.nm_den, 0, 0.0)
+            y = np.insert(self.nm_pre, 0, 0.0)
+            cs_nm_pre = CubicSpline(x, y)
+            self.nm_cs2 = cs_nm_pre(self.nm_den, 1) / self.nm_h2a
             #
         #
         elif model.lower() == 'eskyrme':
@@ -174,20 +206,25 @@ class setupPheno():
             self.label = 'ESKY-'+param
             #: Attribute providing additional notes about the data.
             self.note = "write here notes about this EOS."
-            self.sm_den, self.sm_e2a, self.sm_pre = np.loadtxt( file_in1, usecols=(0,1,2), comments='#', unpack = True )
-            self.nm_den, self.nm_e2a, self.nm_pre = np.loadtxt( file_in2, usecols=(0,1,2), comments='#', unpack = True )
+            self.sm_den, self.sm_e2a_int, self.sm_pre = np.loadtxt( file_in1, usecols=(0,1,2), comments='#', unpack = True )
+            self.nm_den, self.nm_e2a_int, self.nm_pre = np.loadtxt( file_in2, usecols=(0,1,2), comments='#', unpack = True )
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_eps = self.nm_e2a * self.nm_den
             self.sm_kf = self.sm_kfn
             self.sm_kfn = nuda.kf_n( nuda.cst.half * self.sm_den )
             self.nm_kfn = nuda.kf_n( self.nm_den )
             self.sm_kf = self.sm_kfn
             # enthalpy
-            self.sm_h2a = nuda.cst.mnuc2 + self.sm_e2a + self.sm_pre / self.sm_den
-            self.nm_h2a = nuda.cst.mnuc2 + self.nm_e2a + self.nm_pre / self.nm_den
-            # sound speed
+            self.sm_h2a = self.sm_e2a + self.sm_pre / self.sm_den
+            self.nm_h2a = self.nm_e2a + self.nm_pre / self.nm_den
+            # sound speed in SM
             x = np.insert( self.sm_den, 0, 0.0 )
             y = np.insert( self.sm_pre, 0, 0.0 )
             cs_sm_pre = CubicSpline( x, y )
             self.sm_cs2 = cs_sm_pre( self.sm_den, 1) / self.sm_h2a
+            # sound speed in NM
             x = np.insert( self.nm_den, 0, 0.0 )
             y = np.insert( self.nm_pre, 0, 0.0 )
             cs_nm_pre = CubicSpline( x, y )
@@ -214,9 +251,26 @@ class setupPheno():
             #self.ref = ''
             self.label = 'NLRH-'+param
             self.note = "write here notes about this EOS."
-            self.sm_den, self.sm_kfn, self.sm_e2a, self.sm_pre, self.sm_cs2 = np.loadtxt( file_in1, usecols=(0,1,2,3,4), comments='#', unpack = True )
-            self.nm_den, self.nm_kfn, self.nm_e2a, self.nm_pre, self.nm_cs2 = np.loadtxt( file_in2, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.sm_den, self.sm_kfn, self.sm_e2a_int, self.sm_pre, self.sm_cs2_data = np.loadtxt( file_in1, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.nm_den, self.nm_kfn, self.nm_e2a_int, self.nm_pre, self.nm_cs2_data = np.loadtxt( file_in2, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_eps = self.nm_e2a * self.nm_den
             self.sm_kf = self.sm_kfn
+            # enthalpy
+            self.sm_h2a = self.sm_e2a + self.sm_pre / self.sm_den
+            self.nm_h2a = self.nm_e2a + self.nm_pre / self.nm_den
+            # sound speed in SM
+            x = np.insert( self.sm_den, 0, 0.0 )
+            y = np.insert( self.sm_pre, 0, 0.0 )
+            cs_sm_pre = CubicSpline( x, y )
+            self.sm_cs2 = cs_sm_pre( self.sm_den, 1) / self.sm_h2a
+            # sound speed in NM
+            x = np.insert( self.nm_den, 0, 0.0 )
+            y = np.insert( self.nm_pre, 0, 0.0 )
+            cs_nm_pre = CubicSpline( x, y )
+            self.nm_cs2 = cs_nm_pre( self.nm_den, 1) / self.nm_h2a
             #
         elif model.lower() == 'ddrh':
             #
@@ -226,10 +280,28 @@ class setupPheno():
             if nuda.env.verb: print('Reads file2:',file_in2)
             #self.ref = ''
             self.label = 'DDRH-'+param
+            if param == "DDMEd": self.label = "DDRH-DDME$\\delta$"
             self.note = "write here notes about this EOS."
-            self.sm_den, self.sm_kfn, self.sm_e2a, self.sm_pre, self.sm_cs2 = np.loadtxt( file_in1, usecols=(0,1,2,3,4), comments='#', unpack = True )
-            self.nm_den, self.nm_kfn, self.nm_e2a, self.nm_pre, self.nm_cs2 = np.loadtxt( file_in2, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.sm_den, self.sm_kfn, self.sm_e2a_int, self.sm_pre, self.sm_cs2_data = np.loadtxt( file_in1, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.nm_den, self.nm_kfn, self.nm_e2a_int, self.nm_pre, self.nm_cs2_data = np.loadtxt( file_in2, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_eps = self.nm_e2a * self.nm_den
             self.sm_kf = self.sm_kfn
+            # enthalpy
+            self.sm_h2a = self.sm_e2a + self.sm_pre / self.sm_den
+            self.nm_h2a = self.nm_e2a + self.nm_pre / self.nm_den
+            # sound speed in SM
+            x = np.insert( self.sm_den, 0, 0.0 )
+            y = np.insert( self.sm_pre, 0, 0.0 )
+            cs_sm_pre = CubicSpline( x, y )
+            self.sm_cs2 = cs_sm_pre( self.sm_den, 1) / self.sm_h2a
+            # sound speed in NM
+            x = np.insert( self.nm_den, 0, 0.0 )
+            y = np.insert( self.nm_pre, 0, 0.0 )
+            cs_nm_pre = CubicSpline( x, y )
+            self.nm_cs2 = cs_nm_pre( self.nm_den, 1) / self.nm_h2a
             #
         elif model.lower() == 'ddrhf':
             #
@@ -240,9 +312,26 @@ class setupPheno():
             #self.ref = ''
             self.label = 'DDRHF-'+param
             self.note = "write here notes about this EOS."
-            self.sm_den, self.sm_kfn, self.sm_e2a, self.sm_pre, self.sm_cs2 = np.loadtxt( file_in1, usecols=(0,1,2,3,4), comments='#', unpack = True )
-            self.nm_den, self.nm_kfn, self.nm_e2a, self.nm_pre, self.nm_cs2 = np.loadtxt( file_in2, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.sm_den, self.sm_kfn, self.sm_e2a_int, self.sm_pre, self.sm_cs2_data = np.loadtxt( file_in1, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.nm_den, self.nm_kfn, self.nm_e2a_int, self.nm_pre, self.nm_cs2_data = np.loadtxt( file_in2, usecols=(0,1,2,3,4), comments='#', unpack = True )
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int 
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_eps = self.nm_e2a * self.nm_den
             self.sm_kf = self.sm_kfn
+            # enthalpy
+            self.sm_h2a = self.sm_e2a + self.sm_pre / self.sm_den
+            self.nm_h2a = self.nm_e2a + self.nm_pre / self.nm_den
+            # sound speed in SM
+            x = np.insert( self.sm_den, 0, 0.0 )
+            y = np.insert( self.sm_pre, 0, 0.0 )
+            cs_sm_pre = CubicSpline( x, y )
+            self.sm_cs2 = cs_sm_pre( self.sm_den, 1) / self.sm_h2a
+            # sound speed in NM
+            x = np.insert( self.nm_den, 0, 0.0 )
+            y = np.insert( self.nm_pre, 0, 0.0 )
+            cs_nm_pre = CubicSpline( x, y )
+            self.nm_cs2 = cs_nm_pre( self.nm_den, 1) / self.nm_h2a
             #
         self.den_unit = 'fm$^{-3}$'
         self.kfn_unit = 'fm$^{-1}$'
@@ -269,9 +358,11 @@ class setupPheno():
         if any(self.sm_den): print(f"   sm_den: {np.round(self.sm_den,2)} in {self.den_unit}")
         if any(self.sm_kfn): print(f"   sm_kfn: {np.round(self.sm_kfn,2)} in {self.kfn_unit}")
         if any(self.sm_e2a): print(f"   sm_e2a: {np.round(self.sm_e2a,2)} in {self.e2a_unit}")
+        if any(self.sm_cs2): print(f"   sm_cs2: {np.round(self.sm_cs2,2)}")
         if any(self.nm_den): print(f"   nm_den: {np.round(self.nm_den,2)} in {self.den_unit}")
         if any(self.nm_kfn): print(f"   nm_kfn: {np.round(self.nm_kfn,2)} in {self.kfn_unit}")
         if any(self.nm_e2a): print(f"   nm_e2a: {np.round(self.nm_e2a,2)} in {self.e2a_unit}")
+        if any(self.nm_cs2): print(f"   nm_cs2: {np.round(self.nm_cs2,2)}")
         if any(self.nm_gap): print(f"   nm_gap: {np.round(self.nm_gap,2)} in {self.gap_unit}")
         #
         if nuda.env.verb: print("Exit print_outputs()")
@@ -306,6 +397,10 @@ class setupPheno():
         self.sm_kfn = []
         #: Attribute the symmetric matter Fermi momentum.
         self.sm_kf = []
+        #: Attribute the neutron matter internal energy per particle.
+        self.nm_e2a_int = []
+        #: Attribute the symmetric matter internal energy per particle.
+        self.sm_e2a_int = []
         #: Attribute the neutron matter energy per particle.
         self.nm_e2a = []
         #: Attribute the symmetric matter energy per particle.
@@ -318,6 +413,14 @@ class setupPheno():
         self.nm_pre = []
         #: Attribute the symmetric matter pressure.
         self.sm_pre = []
+        #: Attribute the neutron matter enthalpy per particle.
+        self.nm_h2a = []
+        #: Attribute the symmetric matter enthalpy per particle.
+        self.sm_h2a = []
+        #: Attribute the symmetric matter enthalpy density.
+        self.sm_h2v = []
+        #: Attribute the neutron matter enthalpy density.
+        self.nm_h2v = []
         #: Attribute the neutron matter sound speed (c_s/c)^2.
         self.nm_cs2 = []
         #: Attribute the symmetric matter sound speed (c_s/c)^2.
@@ -327,27 +430,4 @@ class setupPheno():
         #
         return self
 
-def checkPheno(obj,band,matter):
-    '''
-    Check if the phenomenological EOS is inside the band.
-    Return True if inside the band, otherwise return False.
-    '''
-    if matter.lower() == 'nm':
-        x = np.insert( obj.nm_den, 0, 0.0 )
-        y = np.insert( obj.nm_e2a, 0, 0.0 )
-    elif matter.lower() == 'sm':
-        x = np.insert( obj.sm_den, 0, 0.0 )
-        y = np.insert( obj.sm_e2a, 0, 0.0 )
-    elif matter.lower() == 'esym':
-        x = np.insert( obj.den, 0, 0.0 )
-        y = np.insert( obj.esym, 0, 0.0 )
-    else:
-        print('checkPheno: issue with matter:',matter)
-        exit()
-    cs_e2a = CubicSpline( x, y )
-    flag = True
-    for ind,den in enumerate(band.den):
-        if abs(cs_e2a(den)-band.e2a[ind]) > band.e2a_std[ind]:
-            flag = False
-    return flag
 

nucleardatapy/matter/setup_pheno_esym.py

@@ -1,14 +1,9 @@
-import os
-import sys
 import math
 import numpy as np  # 1.15.0
 from scipy.interpolate import CubicSpline
 from scipy.optimize import curve_fit
 import random
 
-#nucleardatapy_tk = os.getenv('NUCLEARDATAPY_TK')
-#sys.path.insert(0, nucleardatapy_tk)
-
 import nucleardatapy as nuda
 
 nsat = 0.16
@@ -59,14 +54,18 @@ def pheno_esym_params( model ):
     #
     #print('For model:',model)
     if model.lower() == 'skyrme':
-        params = [ 'BSK14', 'BSK16', 'BSK17', 'BSK27', 'F-', \
+        params = [ 'BSK14', 'BSK16', 'BSK17', 'BSK27', 'BSkG1', 'BSkG2', 'F-', \
             'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', 'NRAPR', 'RATP', \
             'SAMI', 'SGII', 'SIII', 'SKGSIGMA', 'SKI2', 'SKI4', 'SKMP', \
             'SKMS', 'SKO', 'SKOP', 'SKP', 'SKRSIGMA', 'SKX', 'Skz2', \
             'SLY4', 'SLY5', 'SLY230A', 'SLY230B', 'SV', 'T6', 'T44', \
-            'UNEDF0', 'UNEDF1']
+            'UNEDF0', 'UNEDF1' ]
     elif model.lower() == 'eskyrme':
-        params = [ 'BSk22', 'BSk24', 'BSk25', 'BSk26', 'BSk31', 'BSk32', 'BSkG1', 'BSkG2', 'BSkG3' ]
+        params = [ 'BSk22', 'BSk24', 'BSk25', 'BSk26', 'BSk31', 'BSk32',  'BSkG3','BSkG4' ]
+    elif model.lower() == 'fayans':
+        params = [ 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)' ]
+    elif model.lower() == 'gogny':
+        params = [ 'D1S', 'D1', 'D250', 'D260', 'D280', 'D300' ]
     elif model.lower() == 'nlrh':
         params = [ 'NL-SH', 'NL3', 'NL3II', 'PK1', 'PK1R', 'TM1' ]
     elif model.lower() == 'ddrh':
@@ -86,14 +85,18 @@ class setupPhenoEsym():
     interactions and choosen by the toolkit practitioner. \
     This choice is defined in the variables `model` and `param`.
 
-    If `models` == 'skyrme', `param` can be: 'BSK14', \
-    'BSK16', 'BSK17', 'BSK27', 'F-', 'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', \
+    If `models` == 'Skyrme', `param` can be: 'BSK14', \
+    'BSK16', 'BSK17', 'BSK27', 'BSkG1', 'BSkG2','F-', 'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', \
     'NRAPR', 'RATP', 'SAMI', 'SGII', 'SIII', 'SKGSIGMA', 'SKI2', 'SKI4', 'SKMP', \
     'SKMS', 'SKO', 'SKOP', 'SKP', 'SKRSIGMA', 'SKX', 'Skz2', 'SLY4', 'SLY5', \
     'SLY230A', 'SLY230B', 'SV', 'T6', 'T44', 'UNEDF0', 'UNEDF1'. 
 
     If `models` == 'ESkyrme', `param` can be: 'BSk22', 'BSk24', 'BSk25', \
-    'BSk26', 'BSk31', 'BSk32', 'BSkG1', 'BSkG2', 'BSkG3'.
+    'BSk26', 'BSk31', 'BSk32', 'BSkG3','BSkG4' .
+
+    If `models` == 'Fayans', `param` can be: 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)' \
+
+    If `models` == 'Gogny', `param` can be: 'D1S', 'D1', 'D250', 'D260', 'D280', 'D300' \
 
     If `models` == 'NLRH', `param` can be: 'NL-SH', 'NL3', 'NL3II', 'PK1', 'PK1R', 'TM1'. 
 
@@ -156,9 +159,9 @@ class setupPhenoEsym():
         #
         pheno = nuda.matter.setupPheno( model = model, param = param )
         self.sm_den = pheno.sm_den
-        self.sm_e2a = pheno.sm_e2a
+        self.sm_e2a_int = pheno.sm_e2a_int
         self.nm_den = pheno.nm_den
-        self.nm_e2a = pheno.nm_e2a
+        self.nm_e2a_int = pheno.nm_e2a_int
         #pheno.print_outputs( )
         #
         # ===========================
@@ -173,12 +176,12 @@ class setupPhenoEsym():
         #
         # E/A in SM (cubic spline)
         #
-        x = np.insert( self.sm_den, 0, 0.0 ); y = np.insert( self.sm_e2a, 0, 0.0 )
+        x = np.insert( self.sm_den, 0, 0.0 ); y = np.insert( self.sm_e2a_int, 0, 0.0 )
         cs_sm_e2a = CubicSpline( x, y )
         #
         # E/A in NM (cubic spline)
         #
-        x = np.insert( self.nm_den, 0, 0.0 ); y = np.insert( self.nm_e2a, 0, 0.0 )
+        x = np.insert( self.nm_den, 0, 0.0 ); y = np.insert( self.nm_e2a_int, 0, 0.0 )
         cs_nm_e2a = CubicSpline( x, y )
         #
         # density for Esym (no extroplation, only interpolation)
@@ -192,16 +195,16 @@ class setupPhenoEsym():
         #
         # Symmetry energy for the densities defined in self.den
         #
-        self.esym_sm_e2a = cs_sm_e2a( self.den )
-        self.esym_nm_e2a = cs_nm_e2a( self.den )
-        self.esym = self.esym_nm_e2a - self.esym_sm_e2a
+        self.esym_sm_e2a_int = cs_sm_e2a( self.den )
+        self.esym_nm_e2a_int = cs_nm_e2a( self.den )
+        self.esym = self.esym_nm_e2a_int - self.esym_sm_e2a_int
         self.esym_sm_pre = self.den**2 * cs_sm_e2a( self.den, 1 )
         self.esym_sym_pre = self.den**2 * cs_nm_e2a( self.den, 1 ) - self.esym_sm_pre
         #
         self.den_unit = 'fm$^{-3}$'
         self.kf_unit = 'fm$^{-1}$'
         self.esym_unit = 'MeV'
-        self.e2v_unit = 'MeV fm$^{-3}$'
+        self.eps_unit = 'MeV fm$^{-3}$'
         self.pre_unit = 'MeV fm$^{-3}$'
         #
         if nuda.env.verb: print("Exit SetupEOSPhenoEsym()")