Changeset 2471 for XIOS3/trunk

Timestamp:

03/07/23 10:58:57 (16 months ago)

Author:

jderouillat

Message:

Fixes for new MAC environment. AND On clients that do not initialize MPI themselves, do not monitor XIOS initialization with timers (requires that MPI_init has already been done)

Location:

XIOS3/trunk

Files:

• arch/arch-GCC_MACOSX.fcm (modified) (2 diffs)
• extern/remap/src/meshutil.cpp (modified) (1 diff)
• src/attribute_map.cpp (modified) (15 diffs)
• src/interface/c/icdata.cpp (modified) (1 diff)
• src/log_type.hpp (modified) (1 diff)

XIOS3/trunk/arch/arch-GCC_MACOSX.fcm

@@ -7 +7 @@
 %LINKER         mpif90
 
-%BASE_CFLAGS    -w
+%BASE_CFLAGS    -w -std=gnu++11
 %PROD_CFLAGS    -O3 -D BOOST_DISABLE_ASSERTS
 %DEV_CFLAGS     -g
 %DEBUG_CFLAGS   -g -O2
 
-%BASE_FFLAGS    -D__NONE__
+%BASE_FFLAGS    -D__NONE__ -ffree-line-length-none
 %PROD_FFLAGS    -O3
 %DEV_FFLAGS     -g -O2
@@ -20 +20 @@
 %BASE_LD        -lstdc++
 
-%CPP            /opt/local/bin/cpp-mp-4.5
-%FPP            /opt/local/bin/cpp-mp-4.5 -P
-%MAKE           gmake
+%CPP            cpp
+%FPP            cpp -P
+%MAKE           make
 

XIOS3/trunk/extern/remap/src/meshutil.cpp

@@ -5 +5 @@
 #include "earcut.hpp"
 #include <vector>
+#include <array>
 
 namespace sphereRemap {

XIOS3/trunk/src/attribute_map.cpp

@@ -402 +402 @@
            {
              oss << ", " << it->second->getName() << "_";
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -452 +452 @@
            {
              oss << ", " << it->second->getName() << "_";
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -502 +502 @@
            {
              oss << ", " << it->second->getName() << "_";
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -552 +552 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -587 +587 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -614 +614 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -649 +649 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -676 +676 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -711 +711 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -738 +738 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -776 +776 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -803 +803 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -841 +841 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -868 +868 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;
@@ -906 +906 @@
            {
              oss << ", " << it->second->getName();
-             if (oss.tellp() - startPos > 90)
+             if ((long)oss.tellp() - startPos > 90)
              {
                oss << "  &" << iendl;

XIOS3/trunk/src/interface/c/icdata.cpp

@@ -66 +66 @@
       if (!cstr2string(client_id, len_client_id, str)) return;
 
-      CTimer::get("XIOS").resume();
-      CTimer::get("XIOS init").resume();
       int initialized;
       MPI_Initialized(&initialized);
-      if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
+      if (initialized)
+      {
+        CTimer::get("XIOS").resume();
+        CTimer::get("XIOS init").resume();
+        local_comm=MPI_Comm_f2c(*f_local_comm);
+      }
       else local_comm=MPI_COMM_NULL;
       CXios::initClientSide(str, local_comm, return_comm);
       *f_return_comm=MPI_Comm_c2f(return_comm);
-      CTimer::get("XIOS init").suspend();
-      CTimer::get("XIOS").suspend();
+      if (initialized)
+      {
+        CTimer::get("XIOS init").suspend();
+        CTimer::get("XIOS").suspend();
+      }
    }
    CATCH_DUMP_STACK

XIOS3/trunk/src/log_type.hpp

@@ -6 +6 @@
 #include <cstdint>
 #include <unordered_map>
+#include <map>
 
 //#include "cxios.hpp"