hot fix for sign issues in TMatrix terms

Project.toml

@@ -1,7 +1,7 @@
 name = "BoltzmannCollisionIntegral"
 uuid = "20179301-8dfd-43f5-a10b-08fddd2c788a"
 authors = ["Christopher Everett and contributors"]
-version = "2.2.2"
+version = "2.2.3"
 
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"

src/Common/DataReading.jl

@@ -5,7 +5,7 @@ Loads all the data stored in `fileName` stored at `fileLocation`.
 
 # Example
 ```julia-repl
-    (Parameters,SAtot3,SAtot4,TAtot,SAtal3,SAtal4,TAtal,SMatrix3,SMatrix4,TMatrix1,TMatrix2,p3Max,p4Max,t3MinMax,t4MinMax,SConv3,SConv4,TConv) = fload_All(fileLocation,fileName);
+    (Parameters,SAtot3,SAtot4,TAtot,SAtal3,SAtal4,TAtal,SMatrix3,SMatrix4,TMatrix1,TMatrix2,p3Max,p4Max,u3MinMax,u4MinMax,SConv3,SConv4,TConv) = fload_All(fileLocation,fileName);
 ```
 Returns a tuple of the data stored in the file. The fields are as follows:
 - `Parameters` : A tuple of the parameters used in the evaluation.
@@ -20,9 +20,9 @@ Returns a tuple of the data stored in the file. The fields are as follows:
 - `TMatrix1` : A 4D matrix of the absorption spectrum for 12->34 interaction.
 - `TMatrix2` : A 4D matrix of the absorption spectrum for 21->34 interaction i.e. by permutation of TMatrix1 and correct application of phase space factors if species 1 != species 2.
 - `p3Max` : The maximum value of the momentum space variable p3 sampled for each bin. (Useful for correcting numerical diffusion)
-- `t3MinMax` : The minimum and maximum values of the momentum space variable t3 sampled for each bin. (Useful for correcting numerical diffusion)
+- `u3MinMax` : The minimum and maximum values of the momentum space variable t3 sampled for each bin. (Useful for correcting numerical diffusion)
 - `p4Max` : The maximum value of the momentum space variable p4 sampled for each bin. (Useful for correcting numerical diffusion)
-- `t4MinMax` : The minimum and maximum values of the momentum space variable t4 sampled for each bin. (Useful for correcting numerical diffusion)
+- `u4MinMax` : The minimum and maximum values of the momentum space variable t4 sampled for each bin. (Useful for correcting numerical diffusion)
 - `SConv3` : A 6D matrix of the convergence of the emission spectrum compared to the previous run with given `Parameters` for 12->34 interaction.
 - `SConv4` : A 6D matrix of the convergence of the emission spectrum compared to the previous run with given `Parameters` for 12->43 interaction.
 - `TConv` : A 4D matrix of the convergence of the absorption spectrum compared to the previous run with given `Parameters`.
@@ -42,14 +42,14 @@ function fload_All(fileLocation::String,fileName::String)
         SMatrix3 = f["SMatrix3"];
         SConv3 = f["SConverge3"];
         p3Max = f["p3Max"];
-        t3MinMax = f["t3MinMax"];
+        u3MinMax = f["u3MinMax"];
 
         SAtot4 = f["STotal4"];
         SAtal4 = f["STally4"];
         SMatrix4 = f["SMatrix4"];
         SConv4 = f["SConverge4"];
         p4Max = f["p4Max"];
-        t4MinMax = f["t4MinMax"];
+        u4MinMax = f["u4MinMax"];
 
         TAtot = f["TTotal"];
         TAtal = f["TTally"];
@@ -62,7 +62,7 @@ function fload_All(fileLocation::String,fileName::String)
         error("no file with name $fileName found at location $fileLocation")
     end
 
-    return (Parameters,SAtot3,SAtot4,TAtot,SAtal3,SAtal4,TAtal,SMatrix3,SMatrix4,TMatrix1,TMatrix2,p3Max,p4Max,t3MinMax,t4MinMax,SConv3,SConv4,TConv);
+    return (Parameters,SAtot3,SAtot4,TAtot,SAtal3,SAtal4,TAtal,SMatrix3,SMatrix4,TMatrix1,TMatrix2,p3Max,p4Max,u3MinMax,u4MinMax,SConv3,SConv4,TConv);
 
 end
 

src/MultiThread/STIntegration_MultiThread.jl

@@ -170,10 +170,10 @@ function SpectraEvaluateMultiThread(userInputMultiThread::Tuple{Tuple{String,Str
         replace!(TMatrix1,NaN=>0e0);
 
         # Angle / Momentum Ranges
-        u3val = bounds(u_up,u_low,u3_num,u3_grid)
-        u4val = bounds(u_up,u_low,u4_num,u4_grid)
-        u1val = bounds(u_up,u_low,u1_num,u1_grid)
-        u2val = bounds(u_up,u_low,u2_num,u2_grid)
+        u3val = bounds(u_low,u_up,u3_num,u3_grid)
+        u4val = bounds(u_low,u_up,u4_num,u4_grid)
+        u1val = bounds(u_low,u_up,u1_num,u1_grid)
+        u2val = bounds(u_low,u_up,u2_num,u2_grid)
         p3val = bounds(p3_low,p3_up,p3_num,p3_grid)
         p4val = bounds(p4_low,p4_up,p4_num,p4_grid)
         p1val = bounds(p1_low,p1_up,p1_num,p1_grid)

src/Serial/STIntegration_Serial.jl

@@ -163,10 +163,10 @@ function SpectraEvaluateSerial(userInputSerial::Tuple{Tuple{String,String,String
         replace!(TMatrix1,NaN=>0e0);
 
         # Angle / Momentum Ranges
-        u3val = bounds(u_up,u_low,u3_num,u3_grid)
-        u4val = bounds(u_up,u_low,u4_num,u4_grid)
-        u1val = bounds(u_up,u_low,u1_num,u1_grid)
-        u2val = bounds(u_up,u_low,u2_num,u2_grid)
+        u3val = bounds(u_low,u_up,u3_num,u3_grid)
+        u4val = bounds(u_low,u_up,u4_num,u4_grid)
+        u1val = bounds(u_low,u_up,u1_num,u1_grid)
+        u2val = bounds(u_low,u_up,u2_num,u2_grid)
         p3val = bounds(p3_low,p3_up,p3_num,p3_grid)
         p4val = bounds(p4_low,p4_up,p4_num,p4_grid)
         p1val = bounds(p1_low,p1_up,p1_num,p1_grid)
@@ -197,7 +197,7 @@ function SpectraEvaluateSerial(userInputSerial::Tuple{Tuple{String,String,String
     # ========== Save Arrays ============== #
 
         #OutputParameters = Parameters
-            
+
         f = jldopen(filePath,"w") # creates file and overwrites previous file if one existed
         write(f,"STotal3",SAtotal3)
         write(f,"STally3",SAtally3)

src/Serial/STMonteCarlo_Serial.jl

@@ -222,7 +222,7 @@ function STMonteCarloAxi_Serial!(SAtotal3::Array{Float64,6},SAtotal4::Array{Floa
             SAtallyView4 .+= UInt32(1)
         end
 
-        # asign to T arrays
+        # assign to T arrays
         TAtotal[loc12] += Tval # ST[3] doesn't change with S loop
         TAtally[loc12] += UInt32(1)
 

src/Synchrotron/MultiThread/SyncIntegration_MultiThread.jl

@@ -70,8 +70,8 @@ function SyncEvaluateMultiThread(userInputSyncMultiThread::Tuple{Tuple{String,St
         replace!(SMatrix,NaN=>0e0); # remove NaN caused by /0e0
 
         # Angle / Momentum Ranges
-        u1val = bounds(u_up,u_low,u1_num,u1_grid)
-        u2val = bounds(u_up,u_low,u2_num,u2_grid)
+        u1val = bounds(u_low,u_up,u1_num,u1_grid)
+        u2val = bounds(u_low,u_up,u2_num,u2_grid)
         p1val = bounds(p1_low,p1_up,p1_num,p1_grid)
         p2val = bounds(p2_low,p2_up,p2_num,p2_grid)
 

src/Synchrotron/Serial/SyncIntegration_Serial.jl

@@ -62,8 +62,8 @@ function SyncEvaluateSerial(userSyncInputSerial::Tuple{Tuple{String,String,Float
         replace!(SMatrix,NaN=>0e0); # remove NaN caused by /0e0
 
         # Angle / Momentum Ranges
-        u1val = bounds(u_up,u_low,u1_num,u1_grid)
-        u2val = bounds(u_up,u_low,u2_num,u2_grid)
+        u1val = bounds(u_low,u_up,u1_num,u1_grid)
+        u2val = bounds(u_low,u_up,u2_num,u2_grid)
         p1val = bounds(p1_low,p1_up,p1_num,p1_grid)
         p2val = bounds(p2_low,p2_up,p2_num,p2_grid)