Changeset 8630 for branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/TRA

Timestamp:

2017-10-17T14:31:49+02:00 (7 years ago)

Author:

andmirek

Message:

#1962 merge with branches/UKMO/dev_r7573_xios_write (doesn't woork)

Location:

branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/TRA

Files:

• traadv.F90 (modified) (2 diffs)
• traqsr.F90 (modified) (2 diffs)
• trasbc.F90 (modified) (2 diffs)

branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

@@ -45 +45 @@
    PUBLIC   tra_adv        ! routine called by step module
    PUBLIC   tra_adv_init   ! routine called by opa module
-
    !                            !!* Namelist namtra_adv *
    LOGICAL ::   ln_traadv_cen    ! centered scheme flag
@@ -300 +299 @@
       !
       CALL tra_adv_mle_init            !== initialisation of the Mixed Layer Eddy parametrisation (MLE)  ==!
+      lr_traadv_cen2 = ln_traadv_cen2
       !
    END SUBROUTINE tra_adv_init

branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -36 +36 @@
    USE wrk_nemo       ! Memory Allocation
    USE timing         ! Timing
+   USE iom_def, ONLY : lwxios
 
    IMPLICIT NONE
@@ -294 +295 @@
       !
       IF( lrst_oce ) THEN     ! write in the ocean restart file
-         CALL iom_rstput( kt, nitrst, numrow, 'qsr_hc_b'   , qsr_hc      )
-         CALL iom_rstput( kt, nitrst, numrow, 'fraqsr_1lev', fraqsr_1lev ) 
+         IF( lwxios ) CALL iom_swap(      wxios_context          )
+         CALL iom_rstput( kt, nitrst, numrow, 'qsr_hc_b'   , qsr_hc, lxios = lwxios      )
+         CALL iom_rstput( kt, nitrst, numrow, 'fraqsr_1lev', fraqsr_1lev, lxios = lwxios ) 
+         IF( lwxios ) CALL iom_swap(      cxios_context          )
       ENDIF
       !

branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -34 +34 @@
    USE wrk_nemo       ! Memory Allocation
    USE timing         ! Timing
+   USE iom_def, ONLY : lwxios
 
    IMPLICIT NONE
@@ -146 +147 @@
       !                  
       IF( lrst_oce ) THEN           !==  write sbc_tsc in the ocean restart file  ==!
-         CALL iom_rstput( kt, nitrst, numrow, 'sbc_hc_b', sbc_tsc(:,:,jp_tem) )
-         CALL iom_rstput( kt, nitrst, numrow, 'sbc_sc_b', sbc_tsc(:,:,jp_sal) )
+         IF( lwxios ) CALL iom_swap(      wxios_context          )
+         CALL iom_rstput( kt, nitrst, numrow, 'sbc_hc_b', sbc_tsc(:,:,jp_tem), lxios = lwxios )
+         CALL iom_rstput( kt, nitrst, numrow, 'sbc_sc_b', sbc_tsc(:,:,jp_sal), lxios = lwxios )
+         IF( lwxios ) CALL iom_swap(      cxios_context          )
       ENDIF
       !