Reverting coldstart method to setting full domain. Zero gradVM for non-good points. NaN catch for EAVG calculation in CoupleIMaxToMix

src/raiju/raijuColdStartHelper.F90

@@ -107,8 +107,8 @@ module raijuColdStartHelper
         endif
 
         ! Init hot protons
-        !call raiColdStart_initHOTP(Model, Grid, State, t0, dstTarget, etaCS)
-        call raiColdStart_initHOTP_RCOnly(Model, Grid, State, t0, dstTarget, etaCS)
+        call raiColdStart_initHOTP(Model, Grid, State, t0, dstTarget, etaCS)
+        !call raiColdStart_initHOTP_RCOnly(Model, Grid, State, t0, dstTarget, etaCS)
         dps_preCX  = spcEta2DPS(Model, Grid, State%bvol_cc, etaCS, Grid%spc(sIdx_p), isGood)
         ! Hit it with some charge exchange
         if (cs%doCX) then
@@ -141,7 +141,17 @@ module raijuColdStartHelper
 
         ! finally, put it into raiju state
         if(doAccumulate) then
-            State%eta = State%eta + etaCS
+            !$OMP PARALLEL DO default(shared) &
+            !$OMP private(i,j,k)
+            do j=Grid%shGrid%jsg,Grid%shGrid%jeg
+                do i=Grid%shGrid%isg,Grid%shGrid%ieg
+                    do k=1,Grid%Nk
+                        if(etaCS(i,j,k) > State%eta(i,j,k)) then
+                            State%eta(i,j,k) = etaCS(i,j,k)
+                        endif
+                    enddo
+                enddo
+            enddo
         else
             State%eta = etaCS
         endif

src/raiju/raijuPreAdvancer.F90

@@ -497,7 +497,8 @@ module raijuPreAdvancer
                 else
                     ! gradVM should be zero for this point coming out of calcGradIJ_cc, but set to dipole value just in case
                     gradVM(i,j,RAI_PH) = 0.0
-                    gradVM(i,j,RAI_TH) = (-2./3.)*DipFTV_colat(Grid%thcRp(i), B0)**(-5./3.)*dV0_dth(i,j)
+                    gradVM(i,j,RAI_TH) = 0.0
+                    !gradVM(i,j,RAI_TH) = (-2./3.)*DipFTV_colat(Grid%thcRp(i), B0)**(-5./3.)*dV0_dth(i,j)
                 endif
             enddo
         enddo

src/voltron/modelInterfaces/imag2mix_interface.F90

@@ -231,7 +231,7 @@ module imag2mix_interface
             imP_avg(RAI_EDEN)  = imP_avg(RAI_EDEN )/nPnts**2
             imP_avg(RAI_EPRE)  = imP_avg(RAI_EPRE )/nPnts**2
             imP_avg(RAI_NPSP)  = imP_avg(RAI_NPSP )/nPnts**2
-            imP_avg(RAI_EAVG)  = imP_avg(RAI_EFLUX) / imP_avg(RAI_ENFLX)
+            imP_avg(RAI_EAVG)  = imP_avg(RAI_EFLUX) / max(TINY, imP_avg(RAI_ENFLX))
             imP_avg(RAI_GTYPE) = imP_avg(RAI_GTYPE)/nGood
             imP_avg(RAI_THCON) = imP_avg(RAI_THCON)/nGood
             imP_avg(RAI_PHCON) = imP_avg(RAI_PHCON)/nGood