Changeset 8161

Timestamp:

2017-06-12T14:07:00+02:00 (7 years ago)

Author:

andmirek

Message:

few small bug fixes and support for Agrif restart read

Location:

branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (1 diff)
• IOM/iom.F90 (modified) (2 diffs)
• IOM/restart.F90 (modified) (2 diffs)
• SBC/sbcapr.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -249 +249 @@
       CALL iom_put( "avt" , avt                        )    ! T vert. eddy diff. coef.
       CALL iom_put( "avm" , avmu                       )    ! T vert. eddy visc. coef.
+#if defined key_zdftke   ||   defined key_esopa
       IF( lk_zdftke ) THEN   
          CALL iom_put( "tke"      , en                               )    ! TKE budget: Turbulent Kinetic Energy   
          CALL iom_put( "tke_niw"  , e_niw                            )    ! TKE budget: Near-inertial waves   
       ENDIF 
+#endif
       CALL iom_put( "avs" , fsavs(:,:,:)               )    ! S vert. eddy diff. coef. (useful only with key_zdfddm)
                                                             ! Log of eddy diff coef

branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -365 +365 @@
    TYPE(xios_filegroup) :: filegroup_hdl
    INTEGER :: i
-
-        rst_file = TRIM(cn_ocerst_indir)//TRIM(cn_ocerst_in)
+   CHARACTER(lc)  ::   clpath
+
+        clpath = TRIM(cn_ocerst_indir)
+        IF( clpath(LEN_TRIM(clpath):) /= '/' ) clpath = TRIM(clpath) // '/'
+        IF( TRIM(Agrif_CFixed()) == '0' ) THEN
+           rst_file = TRIM(cn_ocerst_indir)//TRIM(cn_ocerst_in)
+        ELSE
+           rst_file = TRIM(cn_ocerst_indir)//'1_'//TRIM(cn_ocerst_in)
+        ENDIF
 !set name of the restart file and enable available fields
         if(lwp) WRITE(numout,*) 'Setting restart filename (for XIOS) to: ',rst_file
@@ -397 +404 @@
 #if defined key_iomput
       TYPE(xios_context) :: nemo_hdl
+
       IF( TRIM(Agrif_CFixed()) == '0' ) THEN
         CALL xios_get_handle(TRIM(cdname),nemo_hdl)

branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -223 +223 @@
 ! can handle checking if variable is in the restart file (there will be no need to open
 ! restart)
-#if defined key_agrif
-      lxios_read = .FALSE.
-      lxios_set = .TRUE.
-#else
-      IF(.NOT.lxios_set) lxios_read = lxios_read.AND.lxios_sini
-      IF( lxios_read) THEN
+         IF(.NOT.lxios_set) lxios_read = lxios_read.AND.lxios_sini
+         IF( lxios_read) THEN
          if(.NOT.lxios_set) then
              rxios_context = 'nemo_rst'
@@ -234 +230 @@
              lxios_set = .TRUE.
          endif
-       ENDIF
-#endif      
+         ENDIF
+         IF( TRIM(Agrif_CFixed()) /= '0' .AND. lxios_read) THEN
+            rxios_context = 'nemo_rst'
+            call iom_init( rxios_context )
+         ENDIF 
       ENDIF
 

branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90

@@ -68 +68 @@
       CHARACTER(len=100) ::  cn_dir   ! Root directory for location of ssr files
       TYPE(FLD_N)        ::  sn_apr   ! informations about the fields to be read
+      LOGICAL            ::  lxios_read ! read restart using XIOS?
       !!
       NAMELIST/namsbc_apr/ cn_dir, sn_apr, ln_ref_apr, rn_pref, ln_apr_obc
@@ -143 +144 @@
          IF( ln_rstart .AND. iom_varid( numror, 'ssh_ibb', ldstop = .FALSE. ) > 0 ) THEN 
             IF(lwp) WRITE(numout,*) 'sbc_apr:   ssh_ibb read in the restart file'
-            CALL iom_get( numror, jpdom_autoglo, 'ssh_ibb', ssh_ibb )   ! before inv. barometer ssh
+            CALL iom_get( numror, jpdom_autoglo, 'ssh_ibb', ssh_ibb, lrxios = lxios_read )   ! before inv. barometer ssh
             !
          ELSE                                         !* no restart: set from nit000 values