Changeset 3701

Timestamp:

2012-11-28T10:57:47+01:00 (11 years ago)

Author:

smasson

Message:

dev_MERGE_2012: add missing modifications for xios

Location:

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC

Files:

• SBC/sbcmod.F90 (modified) (3 diffs)
• nemogcm.F90 (modified) (3 diffs)
• step.F90 (modified) (1 diff)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -95 +95 @@
       ENDIF
 
-      call flush(numout)
       REWIND( numnam )           ! Read Namelist namsbc
       READ  ( numnam, namsbc )
-      call flush(numout)
 
       !                          ! overwrite namelist parameter using CPP key information
@@ -268 +266 @@
       !                                            !        forcing field computation         !
       !                                            ! ---------------------------------------- !
-
-      CALL iom_setkt( kt + nn_fsbc - 1 )                 ! in sbc, iom_put is called every nn_fsbc time step
       !
       IF( ln_apr_dyn ) CALL sbc_apr( kt )                ! atmospheric pressure provided at kt+0.5*nn_fsbc
@@ -377 +373 @@
       ENDIF
       !
-      CALL iom_setkt( kt )           ! iom_put outside of sbc is called at every time step
-      !
       CALL iom_put( "utau", utau )   ! i-wind stress   (stress can be updated at 
       CALL iom_put( "vtau", vtau )   ! j-wind stress    each time step in sea-ice)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -79 +79 @@
    USE lib_mpp         ! distributed memory computing
 #if defined key_iomput
-   USE mod_ioclient
+   USE xios
 #endif
    USE sbctide, ONLY: lk_tide
@@ -199 +199 @@
       CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
 #else
+# if defined key_iomput
+      IF( Agrif_Root() ) THEN
+         CALL xios_finalize             ! end mpp communications
+      ENDIF
+# else
       IF( lk_mpp )   CALL mppstop       ! end mpp communications
+# endif
 #endif
       !
@@ -233 +239 @@
       IF( Agrif_Root() ) THEN
 # if defined key_oasis3 || defined key_oasis4
-         CALL cpl_prism_init( ilocal_comm )                 ! nemo local communicator given by oasis
+         CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
+         CALL xios_initialize( "oceanx",local_comm=ilocal_comm )
+# else
+         CALL  xios_initialize( "nemo",return_comm=ilocal_comm )
 # endif
-         CALL  init_ioclient( ilocal_comm )                 ! exchange io_server nemo local communicator with the io_server
       ENDIF
       narea = mynode( cltxt, numnam, nstop, ilocal_comm )   ! Nodes selection

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -90 +90 @@
                              indic = 0                ! reset to no error condition
       IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init)
-                             CALL iom_setkt( kstp )   ! say to iom that we are at time step kstp
+                             CALL iom_setkt( kstp - nit000 + 1 )   ! say to iom that we are at time step kstp
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>