Commit 7c416dd41554297c9f0d76ecfb592bc40c71b5d0

Authored by Benjamin Renard
1 parent 86f177cf

Fix some bugs with cmake configuration files + Fix a bug during get data request…

… (update the current opened file)
  1 +.project
1 build/ 2 build/
2 scripts/StartServer 3 scripts/StartServer
CMakeLists.txt
@@ -2,16 +2,19 @@ cmake_minimum_required(VERSION 2.6) @@ -2,16 +2,19 @@ cmake_minimum_required(VERSION 2.6)
2 2
3 PROJECT(DDServer) 3 PROJECT(DDServer)
4 4
  5 +add_definitions( -DLINUX )
5 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/) 6 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
6 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/) 7 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
7 8
8 if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) 9 if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
9 #64 bits 10 #64 bits
  11 + MESSAGE( STATUS "64 bits" )
10 set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread") 12 set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
11 set(CMAKE_C_FLAGS_RELEASE "-DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread") 13 set(CMAKE_C_FLAGS_RELEASE "-DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
12 set(USRLIB_DIR "/usr/lib64/:/usr/local/lib64/") 14 set(USRLIB_DIR "/usr/lib64/:/usr/local/lib64/")
13 else( CMAKE_SIZEOF_VOID_P EQUAL 8 ) 15 else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
14 #32 bits 16 #32 bits
  17 + MESSAGE( STATUS "32 bits" )
15 set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread") 18 set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
16 set(CMAKE_C_FLAGS_DEBUG "-DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread") 19 set(CMAKE_C_FLAGS_DEBUG "-DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
17 set(USRLIB_DIR "/usr/lib/:/usr/local/lib/") 20 set(USRLIB_DIR "/usr/lib/:/usr/local/lib/")
src/SERVER/CMakeLists.txt
@@ -21,7 +21,6 @@ target_link_libraries( @@ -21,7 +21,6 @@ target_link_libraries(
21 DD_Client 21 DD_Client
22 ${NETCDFLIBRARY} 22 ${NETCDFLIBRARY}
23 ${CRYPT_LIBRARY} 23 ${CRYPT_LIBRARY}
24 - mpi  
25 ) 24 )
26 25
27 install (TARGETS DD_Server DESTINATION bin) 26 install (TARGETS DD_Server DESTINATION bin)
src/SERVER/DD_GetData.c
@@ -969,6 +969,9 @@ int GetAttribute(int ID, char *VarName) @@ -969,6 +969,9 @@ int GetAttribute(int ID, char *VarName)
969 DD_Var[ID]->LastPacketFlag = MOREDATA; 969 DD_Var[ID]->LastPacketFlag = MOREDATA;
970 DD_Var[ID]->NewFile = 1; // We have to reset all variables 970 DD_Var[ID]->NewFile = 1; // We have to reset all variables
971 DD_Var[ID]->NewFileWasOpen = 1; 971 DD_Var[ID]->NewFileWasOpen = 1;
  972 + //BRE - Update the current opened file
  973 + DD_Var[ID]->CurrCushN = Local.CurrCushN;
  974 + DD_Var[ID]->ncID = Local.ncID;
972 if(Verbose) fprintf(stderr,"GetMultiData(ID=%d), Retun by EOF, MOREDATA, DD_Var[ID]->VarData = %p\n",ID,DD_Var[ID]->VarData); 975 if(Verbose) fprintf(stderr,"GetMultiData(ID=%d), Retun by EOF, MOREDATA, DD_Var[ID]->VarData = %p\n",ID,DD_Var[ID]->VarData);
973 return MOREDATA; 976 return MOREDATA;
974 case TRYAGAIN: // just wait and try again 977 case TRYAGAIN: // just wait and try again