Changeset 5407 for trunk/NEMOGCM/NEMO/OPA_SRC/IOM

Timestamp:

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

Author:

smasson

Message:

merge dev_r5218_CNRS17_coupling into the trunk

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/IOM

Files:

• in_out_manager.F90 (modified) (1 diff)
• iom.F90 (modified) (7 diffs)
• restart.F90 (modified) (5 diffs)

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

@@ -149 +149 @@
    LOGICAL       ::   lwp      = .FALSE.    !: boolean : true on the 1st processor only .OR. ln_ctl
    LOGICAL       ::   lsp_area = .TRUE.     !: to make a control print over a specific area
+   CHARACTER(lc) ::   cxios_context         !: context name used in xios
 
    !!----------------------------------------------------------------------

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

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

@@ -24 +24 @@
    USE trdmxl_oce      ! ocean active mixed layer tracers trends variables
    USE divcur          ! hor. divergence and curl      (div & cur routines)
-   USE sbc_ice, ONLY : lk_lim3
 
    IMPLICIT NONE
@@ -135 +134 @@
                      CALL iom_rstput( kt, nitrst, numrow, 'sshb'   , sshb      )
                      !
-      IF( lk_lim3 )  CALL iom_rstput( kt, nitrst, numrow, 'fse3t_b', fse3t_b(:,:,:) )
-                     !
                      CALL iom_rstput( kt, nitrst, numrow, 'un'     , un        )     ! now fields
                      CALL iom_rstput( kt, nitrst, numrow, 'vn'     , vn        )
@@ -148 +145 @@
                      CALL iom_rstput( kt, nitrst, numrow, 'rhd'    , rhd       )
 #endif
-                  IF( lk_lim3 ) THEN
-                     CALL iom_rstput( kt, nitrst, numrow, 'fraqsr_1lev'  , fraqsr_1lev     ) !clem modif
-                  ENDIF
       IF( kt == nitrst ) THEN
          CALL iom_close( numrow )     ! close the restart file (only at last time step)
@@ -236 +230 @@
          CALL iom_get( numror, jpdom_autoglo, 'hdivb'  , hdivb   )
          CALL iom_get( numror, jpdom_autoglo, 'sshb'   , sshb    )
-         IF( lk_lim3 )   CALL iom_get( numror, jpdom_autoglo, 'fse3t_b', fse3t_b(:,:,:) )
       ELSE
          neuler = 0
@@ -279 +272 @@
          ENDIF
 
-         IF( lk_lim3 .AND. .NOT. lk_vvl ) THEN
-            DO jk = 1, jpk
-               fse3t_b(:,:,jk) = fse3t_n(:,:,jk)
-            END DO
-         ENDIF
-
-      ENDIF
-      !
-      IF( lk_lim3 ) THEN
-         CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev' , fraqsr_1lev )
       ENDIF
       !