Resolve merge conflict in CHANGELOG.md.

cherab · Feb 16, 2022 · cc57399 · cc57399
2 parents 0246b9d + b84f009
commit cc57399
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,8 +8,10 @@ Bug fixes:
 * Fix wavelength indexing in Bremsstrahlung emission model. (#352)
 
 New:
+* Make f_profile (current flux) a read-only attribute of EFITEquilibrium. (#355)
 * Add new classes for free-free Gaunt factors and improve accuracy of the Gaunt factor used in Bremsstrahlung emission model. (#352)
 
+
 Release 1.3.0 (8 Dec 2021)
 --------------------------
 

diff --git a/cherab/tools/equilibrium/efit.pxd b/cherab/tools/equilibrium/efit.pxd
@@ -43,9 +43,8 @@ cdef class EFITEquilibrium:
  readonly double time
  readonly np.ndarray lcfs_polygon, limiter_polygon
  readonly np.ndarray psi_data, r_data, z_data
- readonly Function1D q
+ readonly Function1D q, f_profile
  double _b_vacuum_magnitude, _b_vacuum_radius
- Function1D _f_profile
  Function2D _dpsidr, _dpsidz
 
 

diff --git a/cherab/tools/equilibrium/efit.pyx b/cherab/tools/equilibrium/efit.pyx
@@ -73,6 +73,7 @@ cdef class EFITEquilibrium:
 
  :ivar Function2D psi: The poloidal flux in the r-z plane, :math:`\psi(r,z)`.
  :ivar Function2D psi_normalised: The normalised poloidal flux in the r-z plane, :math:`\psi_n(r,z)`.
+ :ivar Function1D f_profile: The current flux at the specified normalised poloidal flux, :math:`F(\psi_n)`.
  :ivar Function1D q: The safety factor :math:`q` at the specified normalised poloidal flux, :math:`q(\psi_n)`.
  :ivar VectorFunction2D b_field: A 2D function that returns the magnetic field vector at the specified
  point in the r-z plane, :math:`B(r, z)`.
@@ -119,7 +120,7 @@ cdef class EFITEquilibrium:
  self.z_range = z.min(), z.max()
  self._b_vacuum_magnitude = b_vacuum_magnitude
  self._b_vacuum_radius = b_vacuum_radius
- self._f_profile = Interpolator1DArray(f_profile[0, :], f_profile[1, :], 'cubic', 'none', 0)
+ self.f_profile = Interpolator1DArray(f_profile[0, :], f_profile[1, :], 'cubic', 'none', 0)
  self.q = Interpolator1DArray(q_profile[0, :], q_profile[1, :], 'cubic', 'none', 0)
 
  # populate points
@@ -130,7 +131,7 @@ cdef class EFITEquilibrium:
 
  # calculate b-field
  dpsi_dr, dpsi_dz = self._calculate_differentials(r, z, psi)
- self.b_field = MagneticField(self.psi_normalised, dpsi_dr, dpsi_dz, self._f_profile, b_vacuum_radius, b_vacuum_magnitude, self.inside_lcfs)
+ self.b_field = MagneticField(self.psi_normalised, dpsi_dr, dpsi_dz, self.f_profile, b_vacuum_radius, b_vacuum_magnitude, self.inside_lcfs)
 
  # populate flux coordinate attributes
  self.toroidal_vector = ConstantVector2D(Vector3D(0, 1, 0))