Changeset 65 for trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

Timestamp:

01/02/13 18:50:00 (12 years ago)

Author:

smasson

Message:

bugfix for agrf, obc and xios

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -89 +89 @@
       TYPE(xios_time) :: dtime    = xios_time(0, 0, 0, 0, 0, 0)
       CHARACTER(len=19) :: cldate 
-      !!----------------------------------------------------------------------
-
-      CALL xios_context_initialize("nemo", mpi_comm_opa)
+      CHARACTER(len=10) :: clname
+      !!----------------------------------------------------------------------
+      
+      clname = "nemo"
+      IF( TRIM(Agrif_CFixed()) /= '0' )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname)
+      CALL xios_context_initialize(TRIM(clname), mpi_comm_opa)
       CALL iom_swap
 
       ! calendar parameters
       SELECT CASE ( nleapy )        ! Choose calendar for IOIPSL
-      CASE ( 1)   ;   CALL xios_set_context_attr("nemo", calendar_type= "Gregorian")
-      CASE ( 0)   ;   CALL xios_set_context_attr("nemo", calendar_type= "NoLeap")
-      CASE (30)   ;   CALL xios_set_context_attr("nemo", calendar_type= "D360")
+      CASE ( 1)   ;   CALL xios_set_context_attr(TRIM(clname), calendar_type= "Gregorian")
+      CASE ( 0)   ;   CALL xios_set_context_attr(TRIM(clname), calendar_type= "NoLeap")
+      CASE (30)   ;   CALL xios_set_context_attr(TRIM(clname), calendar_type= "D360")
       END SELECT
       WRITE(cldate,"(i4.4,'-',i2.2,'-',i2.2,' 00:00:00')") nyear,nmonth,nday 
-      CALL xios_set_context_attr("nemo", start_date=cldate )
+      CALL xios_set_context_attr(TRIM(clname), start_date=cldate )
 
       ! horizontal grid definition
@@ -341 +344 @@
       INTEGER ::   i_s, i_e   ! temporary integer
       CHARACTER(LEN=100)    ::   clinfo    ! info character
-      INTEGER :: inb_period_initial, inb_period_final, inb_period_sec, inb_period_max, inb_period
       !---------------------------------------------------------------------
       !
@@ -351 +353 @@
          i_s = 1
          i_e = jpmax_files
-#if defined key_iomput
-         CALL xios_context_finalize()
-#endif
       ENDIF