Changeset 369 for XIOS/trunk/src/test

Timestamp:

10/16/12 13:04:44 (12 years ago)

Author:

ymipsl

Message:

Major Update

• redesign Type and attribute manipulation
• add enumerate type and attribute
• use blitz class array instead of boost class array

YM

Location:

XIOS/trunk/src/test

Files:

• test.cpp (modified) (3 diffs)
• test_cs.f90 (modified) (2 diffs)
• test_xios.cpp (modified) (2 diffs)

XIOS/trunk/src/test/test.cpp

@@ -8 +8 @@
 #include "date.hpp"
 #include "calendar_util.hpp"
+//#include "test_enum.hpp"
+#include "type.hpp"
+//#include "axis.hpp"
+//#include "field.hpp"
+#include "declare_attribute.hpp"
+#include "attribute_map.hpp"
+#include "array_new.hpp"
+#include "attribute_array.hpp"
+#include "attribute_array_impl.hpp"
+
+
 
 using namespace std ;
@@ -13 +24 @@
 using namespace boost::gregorian ;
 using namespace xios;
+using namespace blitz;
+
+  class CEnum_color
+  {
+    public:
+    enum t_enum { rouge=0, vert, bleu} ;
+    static const char** getStr(void) { static const char * enumStr[] = { "rouge", "vert", "bleu" } ; return enumStr ; }   
+    int getSize(void) { return 3 ; }   
+  } ;
+
+#include "enum.hpp"
+#include "enum_impl.hpp"
+#include "enum_ref_impl.hpp"
+#include "attribute_enum.hpp"
+#include "attribute_enum_impl.hpp"
+
+template class CEnum<CEnum_color> ;
+template class CAttributeEnum<CEnum_color> ;
+
 
 int main(void)
@@ -18 +48 @@
 //      ptime t(time_from_string("2012-02-30 15:24")) ;
 //      std::cout << to_simple_string(t) << std::endl;
-      CGregorianCalendar MyCalendar("2011-03-01 00:00") ;
-      cout<<MyCalendar.getInitDate()<<endl;
-      cout<<MyCalendar.getCurrentDate()<<endl ;
-      cout<<MyCalendar.getCurrentDate()-1*Day<<endl ;
+  CGregorianCalendar MyCalendar("2011-03-01 00:00") ;
+  cout<<MyCalendar.getInitDate()<<endl;
+  cout<<MyCalendar.getCurrentDate()<<endl ;
+  cout<<MyCalendar.getCurrentDate()-1*Day<<endl ;
+      
+  //CEnum<CEnum_color> MyEnum ;
+  //MyEnum.val=CEnum<CEnum_color>::rouge ;
+  
+  CEnum_color::t_enum y;
+  
+  CType<int> a(10) ;
+  CType<int> b ;
+  
+  a=5 ;
+  b=10.5 ;
+  a=a+b ;
+  cout<<a<<endl ;
+  if (a==5) cout<<"a que coucou"<<endl ;
+  else if (a!=5) cout<<"a que pas coucou"<<endl ;
+  
+  CType_ref<int> c(a);
+  cout<<c<<endl ;
+  a=3 ;
+  cout<<c<<endl ;
+//  c=b ;
+  cout<<c<<endl ;
+  b=4 ;
+  cout<<c<<endl ;
+  c.set_ref(b) ;
+  cout<<c<<endl ;
+  int x=c+c+a ;
+  cout<<x<<endl ;
+ 
+//  test::CAttributeTemplate<int> xx("toto") ;
+//  test::totoatt toto ;
+//  test::titiatt titi ;
+//  CAxis A ;
+//  CTest A ;
+//  CAxis B ;
+//    CField A ;
+//    cout<<xx.size()<<endl ;
+
+  CEnum<CEnum_color> color,color1 ;
+  color=CEnum<CEnum_color>::rouge ;
+  color1=color ;
+  
+  if (color1==CEnum<CEnum_color>::rouge) cout<<"Rouge !!"<<endl ;
+  if (color1==color) cout<<"Rouge !!"<<endl ;
+  color=CEnum<CEnum_color>::bleu ;
+ 
+  if (color1==color) cout<<"Rouge !!"<<endl ;
+  
+  cout<<color1.toString()<<endl ;
+  color1.fromString("vert ") ;
+  cout<<color1.toString()<<endl ;
+ 
+//  color1.fromString("jaune") ;
+  cout<<color1.toString()<<endl ;
+  cout<<sizeof(CEnum_color::t_enum)<<endl ; 
+  
+  CEnum_color::t_enum tt ;
+  tt=(CEnum_color::t_enum)1 ;
+  int ii=tt ;
+  cout<<ii<<endl ;
+  
+  CAttributeEnum<CEnum_color> toto("toto",CEnum_color::rouge) ;
+  CAttributeEnum<CEnum_color> titi("titi",CEnum_color::vert) ;
+  cout<<toto.toString()<<endl ;
+  toto.fromString(" vert  ") ;
+  cout<<toto.toString()<<endl ;
+
+  tt=toto ;
+  cout<<tt<<endl ;
+  cout<<titi.toString()<<endl ;
+  
+  if (titi==toto) cout<<"titi==toto"<<endl ;
+  else cout<<"titi!=toto"<<endl ;
+  titi=CEnum_color::rouge ;
+  if (titi==toto) cout<<"titi==toto"<<endl ;
+  else cout<<"titi!=toto"<<endl ;
+
+  CArray<int,2> A(2,2) ;
+  CArray<int,2> B(2,2) ;
+  A=1,2,3,4 ;
+  B = 1 ;
+  B+=A ;
+  cout<<B.toString()<<endl ;
+  cout<<A.toString()<<endl ;
+  string str="(0,1) x (0,1) [4 3 2 1]" ;
+  CArray<int,2> C ;
+  CBufferOut out(B.size()) ;
+  
+  B.toBuffer(out) ;
+  
+  CBufferIn in(out.begin,B.size()) ;
+  C.fromBuffer(in) ;
+  
+  cout<<C<<endl ; 
+  
+  CAttributeArray<int,2> attr("toto") ;
+  attr.resize(2,2) ;
+  attr=C ;
+  cout<<"attr "<<attr<<endl ;
+  cout<<attr.toString()<<endl ;
   return 1 ;  
 }

XIOS/trunk/src/test/test_cs.f90

@@ -10 +10 @@
   CALL MPI_COMM_SIZE(MPI_COMM_WORLD,size,ierr)
   
-  IF (rank<8) THEN
-   CALL client("client",rank,8)
+  IF (rank<7) THEN
+   CALL client("client",rank,7)
   ELSE 
     CALL server
@@ -90 +90 @@
   CALL xios_set_axis_attr("axis_A",size=llm ,value=lval) ;
   CALL xios_set_domain_attr("domain_A",ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, ni=ni,jbegin=jbegin,nj=nj)
-  !CALL xios_set_domain_attr("domain_A",zoom_ni=3,zoom_ibegin=3,zoom_nj=3,zoom_jbegin=6)
+!  CALL xios_set_domain_attr("domain_A",zoom_ni=10,zoom_ibegin=5,zoom_nj=20,zoom_jbegin=10)
   CALL xios_set_domain_attr("domain_A",data_dim=2, data_ibegin=-1, data_ni=ni+2, data_jbegin=-2, data_nj=nj+4)
   CALL xios_set_domain_attr("domain_A",lonvalue=RESHAPE(lon,(/ni*nj/)),latvalue=RESHAPE(lat,(/ni*nj/)))

XIOS/trunk/src/test/test_xios.cpp

@@ -11 +11 @@
 #include "context_server.hpp"
 #include "object_template.hpp"
+#include "array_new.hpp"
 #include <mpi.h>
 
@@ -27 +28 @@
    CBufferIn  bufferIn(&buff,sizeof(buff)) ;
    CMessage msg ;
-/*
-   msg<<(int)3<<(int)2<<(int)1<<str ;
-//   msg<<a<<b<<c ;
-   std::cout<<"message size : "<<msg.size()<<std::endl ;
-   str="turlututu" ;
-   bufferOut<<msg ;
-   msg.clear() ;
-   msg<<a<<b<<c<<str ;
-//   bufferIn>>c>>b>>a>>str ;
-   bufferIn>>msg ;
-   std::cout<<a<<"  "<<b<<"  "<<c<<"  "<<str<<endl ;
-*/
-//   CAttributeTemplate<ARRAY(double,1)> tabIn ;
- //  CAttributeTemplate<ARRAY(double,1)> tabOut ;
-   CAttributeTemplate<ARRAY(double,1)> tabIn("in") ;
-   CAttributeTemplate<ARRAY(double,1)> tabOut("out") ;
 
-   ARRAY_CREATE(tab,double,1,[5]) ; 
- //   tab->resize(extents[5]) ;
-    (*tab)[0]=0 ; (*tab)[1]=1 ;(*tab)[2]=2 ; (*tab)[3]=3 ;(*tab)[4]=4 ;
+   CAttributeArray<double,1> tabIn("in") ;
+   CAttributeArray<double,1> tabOut("out") ;
+
+   CArray<double,1> tab(5)
+    tab=0,1,2,3,4 ;
     tabIn=tab ;
-    (*tab)[0]=4 ; (*tab)[1]=3 ;(*tab)[2]=2 ; (*tab)[3]=1 ;(*tab)[4]=0 ;
+    tab= 4,3,2,1,0
     tabOut=tab ;
 //   tabOut=1 ;