Changes between Version 1 and Version 2 of ClumpObjects

Timestamp:

02/01/13 13:29:29 (12 years ago)

Author:

Baowei Liu

Comment:

—

ClumpObjects

@@ -3 +3 @@
 {{{
    TYPE ClumpDef
-      REAL(KIND=qPREC) :: radius
-      REAL(KIND=qPREC) :: phi
-      REAL(KIND=qPREC) :: theta
+      REAL(KIND=qPREC) :: density=10   !Clump peak density
+      REAL(KIND=qPREC) :: pressure=0   !Clump Pressure
+      REAL(KIND=qPREC) :: temperature=.1      !Clump temperature
+      REAL(KIND=qPREC), DIMENSION(3) :: velocity= (/0,0,0/)  !Clump velocity 
+      REAL(KIND=qPREC), DIMENSION(3) :: position = (/0,0,0/)  !Clump velocity 
+      REAL(KIND=qPREC) :: radius=1
+      REAL(KIND=qPREC) :: phi=0
+      REAL(KIND=qPREC) :: theta=0
       REAL(KIND=qPREC) :: thickness=.1 !thickness of clump smoothing region
-      REAL(KIND=qPREC) :: density=10   !Clump peak density
-      REAL(KIND=qPREC) :: temp=.1      !Clump temperature  
-      REAL(KIND=qPREC), DIMENSION(3) :: velocity= (/0,0,0/)  !Clump velocity
-      REAL(KIND=qPREC), DIMENSION(3) :: xloc = (/0,0,0/)  !Clump velocity
-      REAL(KIND=qPREC) :: B_tor=0     !Maximum Bfield for toroidal configuration
-      REAL(KIND=qPREC) :: B_pol=0     !Maximum Bfield for poloidal configuration
-      REAL(KIND=qPREC) :: Omega       !Angular velocity for solid body rotation
+!      REAL(KIND=qPREC) :: B_tor=0     !Maximum Bfield for toroidal configuration
+!      REAL(KIND=qPREC) :: B_pol=0     !Maximum Bfield for poloidal configuration
+      REAL(KIND=qPREC) :: B_phi=0
+      REAL(KIND=qPREC) :: B_theta=0
+      REAL(KIND=qPREC) :: B_toroidal=0     !Maximum Bfield for toroidal configuration
+      REAL(KIND=qPREC) :: B_poloidal=0     !Maximum Bfield for poloidal configuration
+      REAL(KIND=qPREC) :: omega=0     !Angular velocity for solid body rotation
+      INTEGER :: RefineLevel=MaxDepth
       INTEGER :: SubSample=1
-      INTEGER :: iTracer  !Clump Tracer
+      INTEGER :: iTracer=0                                !Clump Tracer
+      INTEGER :: density_profile=0
       REAL(KIND=qPREC) :: m2A=0 !Amplitude of an m=2 density perturbation [  rho = rho_0*(1+m2A*cos(2*phi))   ]
+      LOGICAL :: PersistInBoundaries = .false.
       INTEGER :: id
-      TYPE(ShapeDef), POINTER :: Shape
-      TYPE(ClumpDef), POINTER :: previous, next
+      TYPE(ShapeDef), POINTER :: Shape => Null()
+      TYPE(PerturbationDef), POINTER :: DensityPerturbation => Null()
+      TYPE(VectorPerturbationDef), POINTER :: VelocityPerturbation => Null()
+      TYPE(PerturbationDef), DIMENSION(:), POINTER :: MagneticPerturbation => Null()
+      INTEGER :: ObjId
    END TYPE ClumpDef
+
 }}}