Merge branch 'PrincetonUniversity:master' into fix-filepath-handling

PrincetonUniversity · Nov 23, 2024 · bf56ef8 · bf56ef8
2 parents 5f31e3e + 4f9c169
commit bf56ef8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Utilities/pythontools/py_spec/output/_plot_pressure.py b/Utilities/pythontools/py_spec/output/_plot_pressure.py
@@ -10,7 +10,7 @@ def plot_pressure(self, normalize=True, ax=None, **kwargs):
     import matplotlib.pyplot as plt
 
     pressure = np.atleast_1d(self.input.physics.pressure) * self.input.physics.pscale
-    tflux = self.output.tflux[: len(pressure)]
+    tflux = np.atleast_1d(self.output.tflux)[: len(pressure)]
     if not normalize:
         #  remove  mu_0
         pressure /= 4 * np.pi * 1.0e-7

diff --git a/src/pp00aa.f90 b/src/pp00aa.f90
@@ -145,7 +145,7 @@ subroutine pp00aa
       SALLOCATE( utflag, (ioff:lnPtrj                    ),    0 ) ! error flag that indicates if fieldlines successfully followed; 22 Apr 13;
       SALLOCATE(  fiota, (ioff:lnPtrj, 1:2               ), zero ) ! will always need fiota(0,1:2);
 
-!$OMP PARALLEL DO SHARED(lnPtrj,ioff,Wpp00aa,Nz,data,fiota,utflag,iota,oita,myid,vvol,cpus,Lconstraint,nPpts,ppts) PRIVATE(itrj,sti)
+!$OMP PARALLEL DO SHARED(lnPtrj,ioff,Wpp00aa,Nz,data,fiota,utflag,iota,oita,myid,vvol,cpus,Lconstraint,nPpts,ppts) PRIVATE(itrj,sti) SCHEDULE(dynamic)
       do itrj = ioff, lnPtrj ! initialize Poincare plot with trajectories regularly spaced between interfaces along \t=0;
 
         ; sti(1:2) = (/ - one + itrj    * two / lnPtrj   , Ppts*pi /)