Merge branch 'main' into correct_chem_generator

clairekope · Jan 11, 2024 · 2357946 · 2357946
2 parents 22c9d3b + 8016fe9
commit 2357946
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,7 +34,7 @@ commands:
             pip install --upgrade pip
             pip install --upgrade wheel
             pip install --upgrade setuptools
-            pip install Cython numpy h5py fastcache flake8 nose girder-client matplotlib pytest gitpython # yt
+            pip install Cython numpy h5py fastcache flake8 nose3 girder-client matplotlib pytest gitpython # yt
             # Temporary workaround to use updated answer testing from the yt dev repository
             # instead of pip until next yt point release
             git clone https://github.com/yt-project/yt
@@ -189,7 +189,7 @@ commands:
 jobs:
   test-suite:
     docker:
-      - image: cimg/python:3.8.5
+      - image: cimg/python:3.10
 
     resource_class: large
     working_directory: ~/enzo-dev
@@ -200,13 +200,13 @@ jobs:
 
       - restore_cache:
           name: "Restore dependencies cache."
-          key: dependencies-v3
+          key: dependencies-v5
 
       - install-dependencies
 
       - save_cache:
           name: "Save dependencies cache"
-          key: dependencies-v3
+          key: dependencies-v5
           paths:
             - ~/.cache/pip
             - ~/venv
@@ -217,16 +217,16 @@ jobs:
 
       - restore_cache:
           name: "Restore test answers."
-          key: test-answers-v15a
+          key: test-answers-v16a
 
       - build-and-test:
-          tag: gold-standard-v15
+          tag: gold-standard-v16
           skipfile: ~/enzo_test/push_suite
           flags: --answer-store
 
       - save_cache:
           name: "Save test answers cache."
-          key: test-answers-v15a
+          key: test-answers-v16a
           paths:
             - ~/enzo_test/push_suite
 
@@ -235,9 +235,12 @@ jobs:
           skipfile: notafile
           flags: --clobber
 
+      - store_artifacts:
+          path: ~/enzo-dev/src/enzo/out.compile
+
   test-compile-options:
     docker:
-      - image: cimg/python:3.8.5
+      - image: cimg/python:3.10
 
     resource_class: large
     working_directory: ~/enzo-dev
@@ -248,13 +251,13 @@ jobs:
 
       - restore_cache:
           name: "Restore dependencies cache."
-          key: dependencies-v3
+          key: dependencies-v5
 
       - install-dependencies
 
       - save_cache:
           name: "Save dependencies cache"
-          key: dependencies-v3
+          key: dependencies-v5
           paths:
             - ~/.cache/pip
             - ~/venv
@@ -268,7 +271,7 @@ jobs:
 
   docs-build:
     docker:
-      - image: cimg/python:3.8.5
+      - image: cimg/python:3.10
 
     working_directory: ~/enzo-dev
 

diff --git a/src/enzo/GalaxySimulationInitialize.C b/src/enzo/GalaxySimulationInitialize.C
@@ -494,6 +494,7 @@ int GalaxySimulationInitialize(FILE *fptr, FILE *Outfptr,
     if (MetaData.TopGridRank > 2)
       Exterior.InitializeExternalBoundaryFace(2, inflow, outflow,
 					      InflowValue, Dummy);
+    Exterior.InitializeExternalBoundaryParticles(MetaData.ParticleBoundaryType);
 
     /* Set Global Variables for RPS Wind (see ExternalBoundary_SetGalaxySimulationBoundary.C)*/
 

diff --git a/src/enzo/Grid_NestedCosmologySimulationInitializeGrid.C b/src/enzo/Grid_NestedCosmologySimulationInitializeGrid.C
@@ -1474,19 +1474,6 @@ int grid::NestedCosmologySimulationInitializeGrid(
 
 	if (CosmologySimulationManuallySetParticleMassRatio == FALSE) {
 
-	  // If there are exactly 1/8 as many particles as cells,
-	  // then set the particle mass to 8 times the usual
-
-	  int NumberOfActiveCells = (GridEndIndex[0]-GridStartIndex[0]+1)*
-	    (GridEndIndex[1]-GridStartIndex[1]+1)*
-	    (GridEndIndex[2]-GridStartIndex[2]+1);
-	  if (NumberOfParticles*8 == NumberOfActiveCells)
-	    UniformParticleMass *= 8;
-	  if (NumberOfParticles == NumberOfActiveCells*8)
-	    UniformParticleMass /= 8;
-
-	  //      UniformParticleMass *= float(POW(TotalRefinement, GridRank));
-
 	  // Issue a warning if PPIO or PRGIO are on (possibility of errors
 	  // being caused)
 	  if( ((ParallelParticleIO == TRUE) || (ParallelRootGridIO == TRUE)) &&

diff --git a/src/enzo/Make.mach.ubuntu b/src/enzo/Make.mach.ubuntu
@@ -60,8 +60,8 @@ MACH_DEFINES   = -DLINUX -DH5_USE_16_API
 MACH_CPPFLAGS = -P -traditional 
 MACH_CFLAGS   = 
 MACH_CXXFLAGS =
-MACH_FFLAGS   = -fno-second-underscore -ffixed-line-length-132
-MACH_F90FLAGS = -fno-second-underscore
+MACH_FFLAGS   = -std=legacy -fno-second-underscore -ffixed-line-length-132
+MACH_F90FLAGS = -std=legacy -fno-second-underscore
 MACH_LDFLAGS  = 
 
 #-----------------------------------------------------------------------