fargopy 0.3.15__py3-none-any.whl → 0.4.0__py3-none-any.whl

fargopy/simulation.py

@@ -699,12 +699,130 @@ class Simulation(fargopy.Fargobj):
                         file_list += "\n"
                 print(file_list)
             return files
+            
+
+    def load_macros(self, summaryfile='summary0.dat'):
+        """
+        Extracts global simulation parameters from the PREPROCESSOR MACROS SECTION in summary0.dat.
+        Returns a dictionary with the parameters found in the macros section.
+        Only the value after the last '=' is stored for each parameter.
+        """
+        summary_path = f"{self.output_dir}/{summaryfile}".replace('//', '/')
+        if not os.path.isfile(summary_path):
+            print(f"No summary file '{summary_path}' found.")
+            return {}
+
+        macros = {}
+        in_macros_section = False
+        with open(summary_path, 'r') as f:
+            for line in f:
+                # Detect the start of the macros section
+                if 'PREPROCESSOR MACROS SECTION' in line:
+                    in_macros_section = True
+                    continue
+                # Stop if another section starts
+                if in_macros_section and 'SECTION' in line and 'PREPROCESSOR MACROS SECTION' not in line:
+                    break
+                if in_macros_section:
+                    # Skip empty lines and lines that don't contain '='
+                    if line.strip() == '' or '=' not in line or line.strip().startswith('=') or line.strip().startswith('#'):
+                        continue
+                    # Extract parameter name and value after the last '='
+                    parts = line.split('=')
+                    if len(parts) >= 2:
+                        key = parts[0].strip()
+                        value_str = parts[-1].strip()
+                        # Try to convert to float if possible
+                        try:
+                            value = float(value_str)
+                        except ValueError:
+                            value = value_str
+                        macros[key] = value
+        self.simulation_macros = macros
+        return macros
+
+                
+    def load_planet_summary(self, summaryfile='summary0.dat'):
+        """
+        Loads planet information from summary.dat.
+        If not found, tries to extract from variables.par (PLANETMASS, ORBITALRADIUS, PLANETCONFIG).
+        Returns a list of dictionaries with name, distance, and mass.
+        """
+        summary_path = f"{self.output_dir}/{summaryfile}".replace('//', '/')
+        if os.path.isfile(summary_path):
+            planets = []
+            with open(summary_path, 'r') as f:
+                lines = f.readlines()
+                for line in lines:
+                    # Skip comments, empty lines, and separators
+                    if line.strip().startswith('#') or not line.strip() or set(line.strip()) == set('-'):
+                        continue
+                    parts = line.split()
+                    if len(parts) >= 3:
+                        # Only accept if the first field is NOT a number
+                        try:
+                            float(parts[0])
+                            continue  # If it's a number, skip the line
+                        except ValueError:
+                            pass  # If not a number, it's a planet name
+                        try:
+                            planet = {
+                                'name': parts[0],
+                                'distance': float(parts[1]),
+                                'mass': float(parts[2])
+                            }
+                            planets.append(planet)
+                        except ValueError:
+                            continue
+            return planets
+
+        # If summary.dat does not exist, try to read from variables.par
+        varfile = f"{self.output_dir}/variables.par".replace('//', '/')
+        if not os.path.isfile(varfile):
+            print(f"No summary file '{summary_path}' or variables file '{varfile}' found.")
+            return []
+
+        planet_mass = None
+        orbital_radius = None
+        planet_config = None
+        with open(varfile, 'r') as f:
+            for line in f:
+                # Look for PLANETMASS, ORBITALRADIUS, PLANETCONFIG lines
+                if line.strip().startswith('PLANETMASS'):
+                    try:
+                        planet_mass = float(line.split()[1])
+                    except Exception:
+                        pass
+                elif line.strip().startswith('ORBITALRADIUS'):
+                    try:
+                        orbital_radius = float(line.split()[1])
+                    except Exception:
+                        pass
+                elif line.strip().startswith('PLANETCONFIG'):
+                    try:
+                        planet_config = line.split()[1]
+                    except Exception:
+                        pass
+
+        if planet_mass is not None and orbital_radius is not None:
+            # Use the config file name as planet name if available
+            planet_name = planet_config.split('/')[-1].split('.')[0] if planet_config else 'planet'
+            return [{
+                'name': planet_name,
+                'distance': orbital_radius,
+                'mass': planet_mass
+            }]
+        else:
+            print("No planet data found in summary.dat or variables.par.")
+            return []
+
 
-    def load_properties(self,quiet=False,
-                        varfile='variables.par',
-                        domain_prefix='domain_',
-                        dimsfile='dims.dat'
-                        ):
+    def load_properties(self, quiet=False,
+                            varfile='variables.par',
+                            domain_prefix='domain_',
+                            dimsfile='dims.dat',
+                            summaryfile='summary0.dat'  # Nuevo parámetro opcional
+                            ):
         if self.output_dir is None:
             print(f"You have to set first the outputs directory with <sim>.set_outputs('<directory>')")
             return
@@ -716,7 +834,7 @@ class Simulation(fargopy.Fargobj):
         print(f"Simulation in {vars.DIM} dimensions")
         
         # Read domains 
-        domains = self._load_domains(vars,domain_prefix)
+        domains = self._load_domains(vars, domain_prefix)
 
         # Store the variables in the object
         self.vars = vars
@@ -730,13 +848,22 @@ class Simulation(fargopy.Fargobj):
         # Read the summary files
         self.nsnaps = self._get_nsnaps()
         print(f"Number of snapshots in output directory: {self.nsnaps}")
-    
+
+        # Leer planetas del summary.dat
+        self.planets = self.load_planet_summary(summaryfile)
+        if self.planets:
+            print("Planets found in summary.dat:")
+            for planet in self.planets:
+                print(f"  Name: {planet['name']}, Distance: {planet['distance']}, Mass: {planet['mass']}")
+        else:
+            print("No planet data found in summary.dat.")
+
         print("Configuration variables and domains load into the object. See e.g. <sim>.vars")
 
     def _get_nsnaps(self):
         """Get the number of snapshots in an output directory
         """
-        error,output = fargopy.Sys.run(f"ls {self.output_dir}/summary[0-9]*.dat")
+        error, output = fargopy.Sys.run(f"ls {self.output_dir}/summary[0-9]*.dat")
         if error == 0:
             files = output[:-1]
             nsnaps = len(files)
@@ -745,7 +872,7 @@ class Simulation(fargopy.Fargobj):
             print(f"No summary file in {self.output_dir}")
             return 0
 
-    def _load_dims(self,dimsfile):
+    def _load_dims(self, dimsfile):
         """Parse the dim directory
         """
         dimsfile = f"{self.output_dir}/{dimsfile}".replace('//','/')
@@ -843,35 +970,96 @@ class Simulation(fargopy.Fargobj):
 
         return domains        
 
-    def load_field(self,field,snapshot=None,type='scalar'):
 
-        if not self.has('vars'):
-            # If the simulation has not loaded the variables
-            dims, vars, domains = self.load_properties()
-        
-        # In case no snapshot has been provided use 0
-        snapshot = 0 if snapshot is None else snapshot
-
-        field_data = []
-        if type == 'scalar':
-            file_name = f"{field}{str(snapshot)}.dat"
-            file_field = f"{self.output_dir}/{file_name}".replace('//','/')
-            field_data = self._load_field_scalar(file_field)
-        elif type == 'vector':
-            field_data = []
-            variables = ['x','y'] 
-            if self.vars.DIM == 3:
-                variables += ['z'] 
-            for i,variable in enumerate(variables):
-                file_name = f"{field}{variable}{str(snapshot)}.dat"
-                file_field = f"{self.output_dir}/{file_name}".replace('//','/')
-                field_data += [self._load_field_scalar(file_field)]
-        else:
-            raise ValueError(f"fargopy.Field type '{type}' not recognized.")
+    def load_field(self, fields, slice=None, snapshot=None, type=None, interpolate=False):
+        """
+        Load a field from the simulation.
+
+        Parameters:
+            fields (str or list of str): Field name(s) to load.
+            slice (str, optional): Slice for 2D data (e.g., 'theta=1.5').
+            snapshot (int, optional): Snapshot index to load.
+            type (str, optional): Type of the field ('scalar' or 'vector'). Default is 'scalar'.
+            interpolate (bool, optional): Whether to interpolate the field. Default is False.
+
+        Returns:
+            fargopy.Field or fargopy.DataHandler: The loaded field(s) or DataHandler object(s).
+        """
+        # Ensure fields is a list
+        if isinstance(fields, str):
+            fields = [fields]
+
+        # Interpolation case
+        if interpolate==True:
+            fields_data = []
+            for field in fields:
+                field_data = fargopy.FieldInterpolator(self)
+                # Pass the current field instead of the entire list
+                field_data.load_data(field, slice, snapshot)
+                fields_data.append(field_data)
+            return fields_data if len(fields_data) > 1 else fields_data[0]
+
+        # Non-interpolation case
+        else :
+            if not self.has('vars'):
+                # If the simulation has not loaded the variables
+                dims, vars, domains = self.load_properties()
+
+            # Use snapshot 0 by default if not provided
+            snapshot = 0 if snapshot is None else snapshot
+
+            loaded_fields = []
+            
+            for field in fields:
+                field_data = []
+
+                # Determine the field type if not specified
+                field_type = type
+                if field_type is None:
+                    if field in ['gasdens', 'gasenergy']:
+                        field_type = 'scalar'
+                    elif field == 'gasv':
+                        field_type = 'vector'
+                    else:
+                        raise ValueError(f"Field type for '{field}' could not be inferred. Please specify it explicitly.")
+
+                if field_type == 'scalar':
+                    file_name = f"{field}{str(snapshot)}.dat"
+                    file_field = f"{self.output_dir}/{file_name}".replace('//', '/')
+                    field_data = self._load_field_scalar(file_field)
+                elif field_type == 'vector':
+                    field_data = []
+                    variables = ['x', 'y']
+                    if self.vars.DIM == 3:
+                        variables += ['z']
+                    for variable in variables:
+                        file_name = f"{field}{variable}{str(snapshot)}.dat"
+                        file_field = f"{self.output_dir}/{file_name}".replace('//', '/')
+                        field_data.append(self._load_field_scalar(file_field))
+                else:
+                    raise ValueError(f"fargopy.Field type '{field_type}' not recognized.")
+
+                # Create the field object
+                loaded_field = fargopy.Field(
+                    data=np.array(field_data),
+                    coordinates=self.vars.COORDINATES,
+                    domains=self.domains,
+                    type=field_type
+                )
+
+                # Apply meshslice if a slice is provided
+                if slice:
+                    sliced_data, mesh = loaded_field.meshslice(slice=slice)
+                    # Pass a single dictionary to Dictobj
+                    loaded_field = fargopy.Dictobj(dict=dict(data=sliced_data, mesh=mesh))
+
+
+
+                loaded_fields.append(loaded_field)
+            #print(f'Slice: {slice}.')
+            # Return a single field if only one was provided, or a list if multiple were provided
+            return loaded_fields if len(loaded_fields) > 1 else loaded_fields[0]
 
-        field = fargopy.Field(data=np.array(field_data), coordinates=self.vars.COORDINATES, domains=self.domains, type=type)
-        return field
-    
     def _load_field_scalar(self,file):
         """Load scalar field from file a file.
         """

fargopy/version.py

@@ -1 +1 @@
-version='0.3.15'
+version='0.4.0'

{fargopy-0.3.15.dist-info → fargopy-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fargopy
-Version: 0.3.15
+Version: 0.4.0
 Summary: FARGO3D Wrapping
 Home-page: https://pypi.org/project/fargopy
 Author: Jorge Zuluaga, Alejandro Murillo-González, Matias Montesinos
@@ -17,6 +17,7 @@ Requires-Dist: matplotlib
 Requires-Dist: tqdm
 Requires-Dist: numpy
 Requires-Dist: ipython
+Requires-Dist: joblib
 Requires-Dist: celluloid
 Requires-Dist: psutil
 Requires-Dist: gdown
@@ -459,6 +460,8 @@ You may find in the [examples directory](https://github.com/seap-udea/fargopy/tr
 
 ## What's new
 
+Version 0.4.*:
+- Interpolation and flux computations.
 
 Version 0.3.*:
 

fargopy-0.4.0.dist-info/RECORD

@@ -0,0 +1,17 @@
+fargopy/__init__.py,sha256=LXTuWtqxWCDPWGG9mO20NpK1WtQPWmDhET08OXJ82lE,12526
+fargopy/fields.py,sha256=yHenVK2AdEFDggF6-mZ9O33Q18mJQ-ccP1RaBAjI6Tw,36896
+fargopy/flux.py,sha256=7nSFkX2rKQo4NI-c_GnhXpRhgRv6COvxsUyaNIODqRY,32480
+fargopy/fsimulation.py,sha256=Lo2METd7Qa05A8tvp5GaJss8cQFBCJS0w7gFFve8ySI,18657
+fargopy/plot.py,sha256=T2xhVQnBU9NVebxgMgegcuBc0YZSei12VC6OzD5JihI,1583
+fargopy/simulation.py,sha256=NQIjJ2wu4E7CXHSro3zFEhefRXjQqAw8AaRH5evGJys,50304
+fargopy/sys.py,sha256=O53WNHU3EL3GIrpxuK4mi2er929f6Ztdf5Fej62DDs8,5055
+fargopy/util.py,sha256=Bbll0TwJjFp5hv2luoBu9ogNiepp4oErPFcuty7YqdY,672
+fargopy/version.py,sha256=oa-4RrMgexZC4mIb7ovFgKJij15qqFFtuczJifkJeU0,16
+fargopy/tests/test___init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fargopy-0.4.0.data/scripts/ifargopy,sha256=t5E07jKzOLtNnlNyElQZbzjCW6wnR0bc8uCaZpw9yS8,382
+fargopy-0.4.0.dist-info/licenses/LICENSE,sha256=aIckKnNVrkXQMqEKlzGn_REfTwc82TF35BHMCRwPXCI,1097
+fargopy-0.4.0.dist-info/METADATA,sha256=nkII7w-W0HNHKE3I4DuEygV6X6Nb3Z1vsqZPyXld_HM,17837
+fargopy-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fargopy-0.4.0.dist-info/entry_points.txt,sha256=555NPKYbLCN0fgJbdW4b4azZ5sqjhqVqTUxujBBYEJY,49
+fargopy-0.4.0.dist-info/top_level.txt,sha256=_r66v1_-9T7dB5sQa12AdxaAdsv9-OTwtR-vft4OPBU,8
+fargopy-0.4.0.dist-info/RECORD,,

{fargopy-0.3.15.dist-info → fargopy-0.4.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

fargopy-0.3.15.dist-info/RECORD

@@ -1,16 +0,0 @@
-fargopy/__init__.py,sha256=Ua0ORnNZRgXeU1A-SlT5p2YBBs8x-O30Vwu2xh8b3mg,12490
-fargopy/fields.py,sha256=--TrrAaFO9WmsrecRfdmEV1FRfp6JQRlIqyqGn11p2g,10128
-fargopy/fsimulation.py,sha256=jfaLxgNePUx1seUv4uP5BHhxzU02wAmKbpE25wYnR1Y,23912
-fargopy/plot.py,sha256=T2xhVQnBU9NVebxgMgegcuBc0YZSei12VC6OzD5JihI,1583
-fargopy/simulation.py,sha256=MiVkFsm9irt90xFgAcS_2oz467L-Ox5z2eCtIichuZs,41976
-fargopy/sys.py,sha256=O53WNHU3EL3GIrpxuK4mi2er929f6Ztdf5Fej62DDs8,5055
-fargopy/util.py,sha256=Bbll0TwJjFp5hv2luoBu9ogNiepp4oErPFcuty7YqdY,672
-fargopy/version.py,sha256=tGOTbIKeitQH2urrdMPXqzyOiU7L-EhzSKhBjPcjOU4,17
-fargopy/tests/test___init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fargopy-0.3.15.data/scripts/ifargopy,sha256=t5E07jKzOLtNnlNyElQZbzjCW6wnR0bc8uCaZpw9yS8,382
-fargopy-0.3.15.dist-info/licenses/LICENSE,sha256=aIckKnNVrkXQMqEKlzGn_REfTwc82TF35BHMCRwPXCI,1097
-fargopy-0.3.15.dist-info/METADATA,sha256=DZO8Aj5Obp8rarK4k7wWJ9EtSLoWOef70qLwJUrderk,17762
-fargopy-0.3.15.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-fargopy-0.3.15.dist-info/entry_points.txt,sha256=555NPKYbLCN0fgJbdW4b4azZ5sqjhqVqTUxujBBYEJY,49
-fargopy-0.3.15.dist-info/top_level.txt,sha256=_r66v1_-9T7dB5sQa12AdxaAdsv9-OTwtR-vft4OPBU,8
-fargopy-0.3.15.dist-info/RECORD,,