Update shapes.jl

Author: jonschlipf

src/Common/shapes.jl

@@ -1,4 +1,4 @@
-export Custom,Circle,Rectangle,Ellipse
+export Custom,Circle,Rectangle,Ellipse,CustomR
 using SpecialFunctions
 """
     Circle(d)
@@ -29,6 +29,15 @@ A custom inclusion
 struct Custom <: Geometry
     F::Array{Complex{Float64},2}
 end
+"""
+    CustomR(f)
+A custom inclusion
+# Attributes
+* `f` : predefinded custom real space matrix
+"""
+struct Custom <: Geometry
+    f::Array{Complex{Float64},2}
+end
 """
     Ellipse(dx,dy)
 An elliptic inclusion
@@ -50,6 +59,9 @@ end
 function reciprocal(c::Custom,dnx,dny)
     return c.F
 end
+function reciprocal(c::CustomR,dnx,dny)
+    return real2recip(dnx,dny,c.f)
+end
 function reciprocal(e::Ellipse,dnx,dny)
     radix=Matrix(.5*sqrt.((dnx*e.dx).^2+(dny*e.dy).^2))
     result=besselj.(1,2*pi*radix)./radix
@@ -69,6 +81,10 @@ function drawable(c::Custom)
     @warn "The drawable method is not implemented for Custom geometries."
 	return 0,0
 end
+function drawable(c::CustomR)
+    @warn "The drawable method is not implemented for Custom geometries."
+	return 0,0
+end
 function drawable(c::Circle)
     phivals=2pi*(0:.01:1)
     return c.d*.5cos.(phivals),c.d*.5sin.(phivals)