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

Timestamp:

2015-06-11T21:13:22+02:00 (9 years ago)

Author:

smasson

Message:

merge dev_r5218_CNRS17_coupling into the trunk

File:

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

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

@@ -121 +121 @@
       CALL set_scalar
 
-      IF( TRIM(cdname) == "nemo" ) THEN  
+      IF( TRIM(cdname) == TRIM(cxios_context) ) THEN  
          CALL set_grid( "T", glamt, gphit ) 
          CALL set_grid( "U", glamu, gphiu )
@@ -129 +129 @@
       ENDIF
 
-      IF( TRIM(cdname) == "nemo_crs" ) THEN  
+      IF( TRIM(cdname) == TRIM(cxios_context)//"_crs" ) THEN  
          CALL dom_grid_crs   ! Save the parent grid information  & Switch to coarse grid domain
          !
@@ -1212 +1212 @@
       CALL iom_swap( cdname )   ! swap to cdname context
       CALL xios_update_calendar(kt)
-      IF( cdname /= "nemo" ) CALL iom_swap( "nemo" )   ! return back to nemo context
+      IF( cdname /= TRIM(cxios_context) ) CALL iom_swap( TRIM(cxios_context) )   ! return back to nemo context
       !
    END SUBROUTINE iom_setkt
@@ -1222 +1222 @@
          CALL iom_swap( cdname )   ! swap to cdname context
          CALL xios_context_finalize() ! finalize the context
-         IF( cdname /= "nemo" ) CALL iom_swap( "nemo" )   ! return back to nemo context
+         IF( cdname /= TRIM(cxios_context) ) CALL iom_swap( TRIM(cxios_context) )   ! return back to nemo context
       ENDIF
       !
@@ -1291 +1291 @@
          CASE ('T', 'W')
             icnr = -1 ; jcnr = -1
-            IF( TRIM(cdname) == "nemo_crs" ) THEN
+            IF( TRIM(cdname) == TRIM(cxios_context)//"_crs" ) THEN
                z_cnr(:,:,1) = gphif_crs ; z_cnr(:,:,2) = glamf_crs
                z_pnt(:,:,1) = gphit_crs ; z_pnt(:,:,2) = glamt_crs
@@ -1300 +1300 @@
          CASE ('U')
             icnr =  0 ; jcnr = -1
-            IF( TRIM(cdname) == "nemo_crs" ) THEN
+            IF( TRIM(cdname) == TRIM(cxios_context)//"_crs" ) THEN
                z_cnr(:,:,1) = gphiv_crs ; z_cnr(:,:,2) = glamv_crs
                z_pnt(:,:,1) = gphiu_crs ; z_pnt(:,:,2) = glamu_crs
@@ -1309 +1309 @@
          CASE ('V')
             icnr = -1 ; jcnr =  0
-            IF( TRIM(cdname) == "nemo_crs" ) THEN
+            IF( TRIM(cdname) == TRIM(cxios_context)//"_crs" ) THEN
                z_cnr(:,:,1) = gphiu_crs ; z_cnr(:,:,2) = glamu_crs
                z_pnt(:,:,1) = gphiv_crs ; z_pnt(:,:,2) = glamv_crs