Changeset 1058 for XIOS/dev

Timestamp:

02/21/17 10:01:06 (7 years ago)

Author:

yushan

Message:

test with test_complete OK

Location:

XIOS/dev/branch_yushan

Files:

• arch/arch-GCC_LINUX.env (modified) (1 diff)
• bld.cfg (modified) (1 diff)
• inputs/COMPLETE/context_atmosphere.xml (modified) (1 diff)
• inputs/COMPLETE/context_surface.xml (modified) (1 diff)
• src/test/test_complete.f90 (modified) (6 diffs)

XIOS/dev/branch_yushan/arch/arch-GCC_LINUX.env

@@ -1 @@
-module unload netcdf
-module unload hdf5
- 
 
 export HDF5_INC_DIR=$HOME/lib/hdf5/include

XIOS/dev/branch_yushan/bld.cfg

@@ -36 +36 @@
 #test_remap.exe
 #bld::target test_new_features.exe test_unstruct_complete.exe 
-bld::target test_client.exe #test_complete.exe
+bld::target test_client.exe test_complete.exe
 bld::exe_dep
 

XIOS/dev/branch_yushan/inputs/COMPLETE/context_atmosphere.xml

@@ -8 +8 @@
   </field_definition>
 
-  <file_definition type="multiple_file" par_access="collective" output_freq="6h" sync_freq="6h" output_level="10" enabled=".TRUE.">
+  <file_definition type="one_file" par_access="collective" output_freq="6h" sync_freq="6h" output_level="10" enabled=".TRUE.">
     <file id="output_atmosphere" name="output_atmosphere">
       <field field_ref="field_A_atm" />

XIOS/dev/branch_yushan/inputs/COMPLETE/context_surface.xml

@@ -12 +12 @@
   </field_definition>
 
-  <file_definition type="multiple_file" par_access="collective" output_level="10" enabled=".TRUE.">
+  <file_definition type="one_file" par_access="collective" output_level="10" enabled=".TRUE.">
     <file id="output_surface" name="output_surface_6h" output_freq="6h">
       <field field_ref="field_A_srf">

XIOS/dev/branch_yushan/src/test/test_complete.f90

@@ -128 +128 @@
   CALL xios_get_domain_attr("domain_atm",ni=ni,lonvalue_2D=lonvalue)
 
-  PRINT *,"ni",ni
-  PRINT *,"lonvalue",lonvalue;
+  !PRINT *,"ni",ni
+  !PRINT *,"lonvalue",lonvalue;
 
 !!! Fin de la definition du contexte
 
   CALL xios_close_context_definition()
+
+  print *, "xios_close_context_definition(atmosphere)"
 
 !!! Test des valeurs des champs/fichiers
@@ -208 +210 @@
   CALL xios_get_domain_attr("domain_srf",ni=ni,lonvalue_2D=lonvalue)
 
-  PRINT *,"ni",ni
-  PRINT *,"lonvalue",lonvalue ;
+  !PRINT *,"ni",ni
+  !PRINT *,"lonvalue",lonvalue ;
 
 !!! Fin de la definition du contexte SRF
 
   CALL xios_close_context_definition()
+
+  print *, "xios_close_context_definition(surface)" 
 
 
@@ -220 +224 @@
 !####################################################################################
 
-    DO ts=1,24*10
+    !DO ts=1,24*10
+    DO ts=1,24
 
       CALL xios_get_handle("atmosphere",ctx_hdl)
@@ -247 +252 @@
 
       CALL wait_us(5000) ;
+
+
     ENDDO
+
+    print *, "end temporal loop"
 
 !####################################################################################
@@ -255 +264 @@
 !!! Fin des contextes
 
+    print *, "start : xios_context_finalize(surface)"
+
+    CALL xios_get_handle("surface",ctx_hdl) 
+    print *, "xios_get_handle OK"
+    CALL xios_set_current_context(ctx_hdl)
+    print *, "xios_set_current_context OK"
     CALL xios_context_finalize()
+
+    print *, "xios_context_finalize(surface)" 
+
     CALL xios_get_handle("atmosphere",ctx_hdl)
     CALL xios_set_current_context(ctx_hdl)
     CALL xios_context_finalize()
 
+    print *, "xios_context_finalize(atmosphere)"
+
     DEALLOCATE(lon, lat, field_A_atm, lonvalue)
     DEALLOCATE(kindex, field_A_srf)
@@ -269 +289 @@
     CALL xios_finalize()
 
+    print *, "xios_finalize"
+
     CALL MPI_FINALIZE(ierr)