Merge branch 'development' into cppcheck_fixes

AMReX-Astro · Jun 24, 2024 · 3a10c00 · 3a10c00
2 parents 06546a8 + 9b7067f
commit 3a10c00
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/Docs/source/mpi_plus_x.rst b/Docs/source/mpi_plus_x.rst
@@ -106,6 +106,19 @@ To enable this, compile with::
 
    to the ``make`` line or ``GNUmakefile``.
 
+.. note::
+
+   CUDA 11.2 and later can do link time optimization.  This can
+   increase performance by 10-30% (depending on the application), but
+   may greatly increase the compilation time.  This is disabled by
+   default.  To enable link time optimization, add:
+
+   .. code::
+
+      CUDA_LTO=TRUE
+
+   to the ``make`` line of ``GNUmakefile``.
+
 AMD GPUs
 --------
 
@@ -123,4 +136,3 @@ Working at Supercomputing Centers
 Our best practices for running any of the AMReX Astrophysics codes
 at different supercomputing centers is produced in our workflow
 documentation: https://amrex-astro.github.io/workflow/
-
diff --git a/Exec/hydro_tests/gamma_law_bubble/Problem_Derive.cpp b/Exec/hydro_tests/gamma_law_bubble/Problem_Derive.cpp
@@ -52,11 +52,11 @@ void ca_derpi(const Box& bx, FArrayBox& derfab, int dcomp, int /*ncomp*/,
     eos_state.T = dat(i,j,k,UTEMP);
     eos_state.e = dat(i,j,k,UEINT) * rhoInv;
     for (int n = 0; n < NumSpec; n++) {
-      eos_state.xn[n] = dat(i,j,k,UFS+n) / dat(i,j,k,URHO);
+      eos_state.xn[n] = dat(i,j,k,UFS+n) * rhoInv;
     }
 #if NAUX_NET > 0
     for (int n = 0; n < NumAux; n++) {
-      eos_state.aux[n] = dat(i,j,k,UFX+n) / dat(i,j,k,URHO);
+      eos_state.aux[n] = dat(i,j,k,UFX+n) * rhoInv;
     }
 #endif
 

diff --git a/Exec/science/xrb_layered/analysis/vol-zvel.py b/Exec/science/xrb_layered/analysis/vol-zvel.py
@@ -62,7 +62,7 @@ def doit(plotfile):
 
     cam.position = [2.5*ds.domain_right_edge[0],
                     2.5*ds.domain_right_edge[1],
-                    center[2]+0.25*ds.domain_right_edge[2]]
+                    center[2]+0.5*ds.domain_right_edge[2]]
 
     # look toward the center -- we are dealing with an octant
     normal = (center - cam.position)
@@ -71,6 +71,7 @@ def doit(plotfile):
     cam.switch_orientation(normal_vector=normal,
                            north_vector=[0., 0., 1.])
     cam.set_width(ds.domain_width)
+    cam.zoom(1.3)
 
     sc.camera = cam
 
@@ -81,10 +82,11 @@ def doit(plotfile):
     sc.save(f"{plotfile}_zvel_axes.png", sigma_clip=3.0)
 
     sc.save_annotated(f"{plotfile}_zvel_annotated.png",
-                      sigma_clip=4.0, label_fmt="%.2f",
+                      sigma_clip=4.0, #label_fmt="%6.2g",
+                      label_fontsize="16",
                       text_annotate=[[(0.05, 0.05),
-                                      f"t = {ds.current_time.d:7.5f} s",
-                                      dict(horizontalalignment="left")]])
+                                      f"t = {ds.current_time.d:6.4f} s",
+                                      dict(horizontalalignment="left", fontsize=16)]])
 
 
 if __name__ == "__main__":