commit/enzo-dev: 4 new changesets

[commits...@bitbucket.org]

4 new commits in enzo-dev:

https://bitbucket.org/enzo/enzo-dev/commits/d02a7216b2e8/
Changeset: d02a7216b2e8
Branch: week-of-code
User: jwise77
Date: 2019-02-19 12:54:54+00:00
Summary: Do not include c++ header files in C routines
Affected #: 8 files

diff -r 86525df8b782 -r d02a7216b2e8 src/enzo/calc_dt_c.c
--- a/src/enzo/calc_dt_c.c
+++ b/src/enzo/calc_dt_c.c
@@ -8,9 +8,11 @@
#include <stdio.h>
#include <math.h>

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED
+#undef ENZO128_CMODE

/* Table of constant values */


diff -r 86525df8b782 -r d02a7216b2e8 src/enzo/cic_deposit_c.c
--- a/src/enzo/cic_deposit_c.c
+++ b/src/enzo/cic_deposit_c.c
@@ -6,6 +6,7 @@

#include "f2c.h"

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 86525df8b782 -r d02a7216b2e8 src/enzo/cic_flag_c.c
--- a/src/enzo/cic_flag_c.c
+++ b/src/enzo/cic_flag_c.c
@@ -6,6 +6,7 @@

#include "f2c.h"

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 86525df8b782 -r d02a7216b2e8 src/enzo/cic_interp_c.c
--- a/src/enzo/cic_interp_c.c
+++ b/src/enzo/cic_interp_c.c
@@ -6,6 +6,7 @@

#include "f2c.h"

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 86525df8b782 -r d02a7216b2e8 src/enzo/macros_and_parameters.h
--- a/src/enzo/macros_and_parameters.h
+++ b/src/enzo/macros_and_parameters.h
@@ -1,12 +1,16 @@
#ifndef __macros_and_parameters_h_
#define __macros_and_parameters_h_
#include "string.h"
+
+#ifndef ENZO_CMODE
#include <iostream>
#include <iomanip>
#include <vector>
#include <algorithm>
#include <map>
#include <cassert>
+#endif
+
/***********************************************************************
/
/ MACRO DEFINITIONS AND PARAMETERS

diff -r 86525df8b782 -r d02a7216b2e8 src/enzo/ngp_deposit_c.c
--- a/src/enzo/ngp_deposit_c.c
+++ b/src/enzo/ngp_deposit_c.c
@@ -1,5 +1,6 @@
#ifdef CONFIG_PFLOAT_16

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 86525df8b782 -r d02a7216b2e8 src/enzo/pop3_color_maker_c.c
--- a/src/enzo/pop3_color_maker_c.c
+++ b/src/enzo/pop3_color_maker_c.c
@@ -6,6 +6,7 @@

#include "f2c.h"

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 86525df8b782 -r d02a7216b2e8 src/enzo/smooth_deposit_c.c
--- a/src/enzo/smooth_deposit_c.c
+++ b/src/enzo/smooth_deposit_c.c
@@ -8,6 +8,7 @@
#include <stdio.h>
#include <math.h>

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED


https://bitbucket.org/enzo/enzo-dev/commits/0b61075673fa/
Changeset: 0b61075673fa
Branch: week-of-code
User: jwise77
Date: 2019-02-19 12:59:32+00:00
Summary: Fixing string formatting for Gamma
Affected #: 1 file

diff -r d02a7216b2e8 -r 0b61075673fa src/enzo/WriteParameterFile.C
--- a/src/enzo/WriteParameterFile.C
+++ b/src/enzo/WriteParameterFile.C
@@ -309,7 +309,7 @@
fprintf(fptr, "HydroMethod = %"ISYM"\n", HydroMethod);
fprintf(fptr, "huge_number = %e\n", huge_number);
fprintf(fptr, "tiny_number = %e\n", tiny_number);
- fprintf(fptr, "Gamma = %"GOUTSYM"\n", Gamma);
+ fprintf(fptr, "Gamma = %"GSYM"\n", Gamma);
fprintf(fptr, "PressureFree = %"ISYM"\n", PressureFree);
fprintf(fptr, "RefineBy = %"ISYM"\n", RefineBy);
fprintf(fptr, "MaximumRefinementLevel = %"ISYM"\n", MaximumRefinementLevel);


https://bitbucket.org/enzo/enzo-dev/commits/49746a73ee3e/
Changeset: 49746a73ee3e
Branch: week-of-code
User: jwise77
Date: 2019-02-19 13:09:15+00:00
Summary: Forgot to remove an #undef
Affected #: 1 file

diff -r 0b61075673fa -r 49746a73ee3e src/enzo/calc_dt_c.c
--- a/src/enzo/calc_dt_c.c
+++ b/src/enzo/calc_dt_c.c
@@ -12,7 +12,6 @@
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED
-#undef ENZO128_CMODE

/* Table of constant values */



https://bitbucket.org/enzo/enzo-dev/commits/94feb3b6510b/
Changeset: 94feb3b6510b
Branch: week-of-code
User: gbryan
Date: 2019-02-21 13:02:47+00:00
Summary: Merged in jwise77/enzo-dev (pull request #433)

[BUGFIX] Compilation and restart errors with particles-128

Approved-by: Greg Bryan <gbr...@astro.columbia.edu>
Approved-by: Brian O'Shea <os...@msu.edu>
Approved-by: Britton Smith <britto...@gmail.com>
Affected #: 9 files

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/WriteParameterFile.C
--- a/src/enzo/WriteParameterFile.C
+++ b/src/enzo/WriteParameterFile.C
@@ -309,7 +309,7 @@
fprintf(fptr, "HydroMethod = %"ISYM"\n", HydroMethod);
fprintf(fptr, "huge_number = %e\n", huge_number);
fprintf(fptr, "tiny_number = %e\n", tiny_number);
- fprintf(fptr, "Gamma = %"GOUTSYM"\n", Gamma);
+ fprintf(fptr, "Gamma = %"GSYM"\n", Gamma);
fprintf(fptr, "PressureFree = %"ISYM"\n", PressureFree);
fprintf(fptr, "RefineBy = %"ISYM"\n", RefineBy);
fprintf(fptr, "MaximumRefinementLevel = %"ISYM"\n", MaximumRefinementLevel);

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/calc_dt_c.c
--- a/src/enzo/calc_dt_c.c
+++ b/src/enzo/calc_dt_c.c
@@ -8,6 +8,7 @@
#include <stdio.h>
#include <math.h>

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/cic_deposit_c.c
--- a/src/enzo/cic_deposit_c.c
+++ b/src/enzo/cic_deposit_c.c
@@ -6,6 +6,7 @@

#include "f2c.h"

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/cic_flag_c.c
--- a/src/enzo/cic_flag_c.c
+++ b/src/enzo/cic_flag_c.c
@@ -6,6 +6,7 @@

#include "f2c.h"

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/cic_interp_c.c
--- a/src/enzo/cic_interp_c.c
+++ b/src/enzo/cic_interp_c.c
@@ -6,6 +6,7 @@

#include "f2c.h"

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/macros_and_parameters.h
--- a/src/enzo/macros_and_parameters.h
+++ b/src/enzo/macros_and_parameters.h
@@ -1,12 +1,16 @@
#ifndef __macros_and_parameters_h_
#define __macros_and_parameters_h_
#include "string.h"
+
+#ifndef ENZO_CMODE
#include <iostream>
#include <iomanip>
#include <vector>
#include <algorithm>
#include <map>
#include <cassert>
+#endif
+
/***********************************************************************
/
/ MACRO DEFINITIONS AND PARAMETERS

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/ngp_deposit_c.c
--- a/src/enzo/ngp_deposit_c.c
+++ b/src/enzo/ngp_deposit_c.c
@@ -1,5 +1,6 @@
#ifdef CONFIG_PFLOAT_16

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/pop3_color_maker_c.c
--- a/src/enzo/pop3_color_maker_c.c
+++ b/src/enzo/pop3_color_maker_c.c
@@ -6,6 +6,7 @@

#include "f2c.h"

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

diff -r 7d8fe75451e0 -r 94feb3b6510b src/enzo/smooth_deposit_c.c
--- a/src/enzo/smooth_deposit_c.c
+++ b/src/enzo/smooth_deposit_c.c
@@ -8,6 +8,7 @@
#include <stdio.h>
#include <math.h>

+#define ENZO_CMODE
#define ENZO_PYTHON_IMPORTED
#include "macros_and_parameters.h"
#undef ENZO_PYTHON_IMPORTED

Repository URL: https://bitbucket.org/enzo/enzo-dev/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.