Merge branch 'gitlab-updates' into iss9-arepo_dark_matter_interface

Three of four recent commits from [arepo on gitlab](https://gitlab.mpcdf.mpg.de/vrs/arepo). Documentation update omitted since arepo documentation has been removed here.
amusecode · Sep 30, 2022 · ef07a2f · ef07a2f
2 parents 285b495 + 0193040
commit ef07a2f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/amuse/community/arepo/src/cooling/cooling.c b/src/amuse/community/arepo/src/cooling/cooling.c
@@ -477,9 +477,9 @@ void SetOutputGasState(int i, double *ne_guess, double *nH0, double *coolrate)
   double u   = dmax(All.MinEgySpec, SphP[i].Utherm);
 
   /* update GasState as appropriate given compile-time options and cell properties */
-#if defined(USE_SFR)
-  sfr = get_starformation_rate(i);
-#endif /* #if defined(USE_SFR) */
+  //  #if defined(USE_SFR)
+  //  sfr = get_starformation_rate(i);  // call is superfluous at this place
+  // #endif
 
   /* update DoCool */
   DoCool.u_old_input    = u;

diff --git a/src/amuse/community/arepo/src/io/hdf5_util.c b/src/amuse/community/arepo/src/io/hdf5_util.c
@@ -847,7 +847,7 @@ herr_t my_H5Pset_shuffle(hid_t plist_id)
  *
  *  \return Non-negative value if successful.
  */
-herr_t my_H5Pset_deflate(hid_t plist_id, uint level)
+herr_t my_H5Pset_deflate(hid_t plist_id, unsigned int level)
 {
   herr_t status = H5Pset_deflate(plist_id, level);
   if(status < 0)

diff --git a/src/amuse/community/arepo/src/main/proto.h b/src/amuse/community/arepo/src/main/proto.h
@@ -598,7 +598,7 @@ hid_t my_H5Pcreate(hid_t class_id);
 herr_t my_H5Pclose(hid_t plist);
 herr_t my_H5Pset_chunk(hid_t plist, int ndims, const hsize_t *dim);
 herr_t my_H5Pset_shuffle(hid_t plist_id);
-herr_t my_H5Pset_deflate(hid_t plist_id, uint level);
+herr_t my_H5Pset_deflate(hid_t plist_id, unsigned int level);
 herr_t my_H5Pset_fletcher32(hid_t plist_id);
 #endif /* #ifdef HDF5_FILTERS */
 

diff --git a/src/amuse/community/arepo/src/time_integration/do_gravity_hydro.c b/src/amuse/community/arepo/src/time_integration/do_gravity_hydro.c
@@ -265,7 +265,7 @@ void find_gravity_timesteps_and_do_gravity_step_first_half(void)
     }
 
   /* reconstruct list of active particles because it is used for other things too (i.e. wind particles) */
-  timebin_make_list_of_active_particles_up_to_timebin(&TimeBinsGravity, All.HighestActiveTimeBin);
+  timebin_make_list_of_active_particles_up_to_timebin(&TimeBinsGravity, All.HighestSynchronizedTimeBin);
   sumup_large_ints(1, &TimeBinsGravity.NActiveParticles, &TimeBinsGravity.GlobalNActiveParticles);
 #else /* #ifdef HIERARCHICAL_GRAVITY */
 
@@ -276,7 +276,7 @@ void find_gravity_timesteps_and_do_gravity_step_first_half(void)
     timebin_make_list_of_active_particles_up_to_timebin(&TimeBinsGravity, TIMEBINS);
   else
 #endif /* #ifdef FORCE_EQUAL_TIMESTEPS */
-    timebin_make_list_of_active_particles_up_to_timebin(&TimeBinsGravity, All.HighestActiveTimeBin);
+    timebin_make_list_of_active_particles_up_to_timebin(&TimeBinsGravity, All.HighestSynchronizedTimeBin);
   sumup_large_ints(1, &TimeBinsGravity.NActiveParticles, &TimeBinsGravity.GlobalNActiveParticles);
 
   mpi_printf("KICKS: 1st gravity for highest active timebin=%d:  particles %lld\n", All.HighestActiveTimeBin,