Changeset 13975 for issm/trunk/src/c/include/globals.h

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/include/globals.h (modified) (1 diff)

issm/trunk/src/c/include/globals.h

@@ -6 +6 @@
 #define GLOBALS_H_
 
-int my_rank=0;
-int num_procs=1;
+#include "./types.h"
+#include "../classes/IssmComm.h"
+
+COMM IssmComm::comm;
 
 #endif