Changeset 12969 for NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF

Timestamp:

2020-05-26T12:05:09+02:00 (4 years ago)

Author:

andmirek

Message:

ticket #2462: read restart with XIOS independently for each component

Location:

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF

Files:

• zdfgls.F90 (modified) (3 diffs)
• zdfosm.F90 (modified) (2 diffs)
• zdfric.F90 (modified) (1 diff)
• zdftke.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfgls.F90

@@ -1052 +1052 @@
          !                                   ! ---------------
          IF( ln_rstart ) THEN                   !* Read the restart file
-            IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
+            IF( lroxios ) CALL iom_swap( TRIM(crxios_context) )
             id1 = iom_varid( numror, 'en'    , ldstop = .FALSE. )
             id2 = iom_varid( numror, 'avt_k' , ldstop = .FALSE. )
@@ -1059 +1059 @@
             !
             IF( MIN( id1, id2, id3, id4 ) > 0 ) THEN        ! all required arrays exist
-               CALL iom_get( numror, jpdom_autoglo, 'en'    , en    , ldxios = lrxios )
-               CALL iom_get( numror, jpdom_autoglo, 'avt_k' , avt_k , ldxios = lrxios )
-               CALL iom_get( numror, jpdom_autoglo, 'avm_k' , avm_k , ldxios = lrxios )
-               CALL iom_get( numror, jpdom_autoglo, 'hmxl_n', hmxl_n, ldxios = lrxios )
+               CALL iom_get( numror, jpdom_autoglo, 'en'    , en    , ldxios = lroxios )
+               CALL iom_get( numror, jpdom_autoglo, 'avt_k' , avt_k , ldxios = lroxios )
+               CALL iom_get( numror, jpdom_autoglo, 'avm_k' , avm_k , ldxios = lroxios )
+               CALL iom_get( numror, jpdom_autoglo, 'hmxl_n', hmxl_n, ldxios = lroxios )
             ELSE                        
                IF(lwp) WRITE(numout,*)
@@ -1070 +1070 @@
                ! avt_k, avm_k already set to the background value in zdf_phy_init
             ENDIF
-            IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
+            IF( lroxios ) CALL iom_swap( TRIM(cxios_context) )
          ELSE                                   !* Start from rest
             IF(lwp) WRITE(numout,*)

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfosm.F90

@@ -1454 +1454 @@
      !!-----------------------------------------------------------------------------
      IF( TRIM(cdrw) == 'READ'.AND. ln_rstart) THEN
-        IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
+        IF( lroxios ) CALL iom_swap( TRIM(crxios_context) )
         id1 = iom_varid( numror, 'wn'   , ldstop = .FALSE. )
         IF( id1 > 0 ) THEN                       ! 'wn' exists; read
-           CALL iom_get( numror, jpdom_autoglo, 'wn', ww, ldxios = lrxios )
+           CALL iom_get( numror, jpdom_autoglo, 'wn', ww, ldxios = lroxios )
            WRITE(numout,*) ' ===>>>> :  ww read from restart file'
         ELSE
@@ -1466 +1466 @@
         id2 = iom_varid( numror, 'hbli'   , ldstop = .FALSE. )
         IF( id1 > 0 .AND. id2 > 0) THEN                       ! 'hbl' exists; read and return
-           CALL iom_get( numror, jpdom_autoglo, 'hbl' , hbl , ldxios = lrxios )
-           CALL iom_get( numror, jpdom_autoglo, 'hbli', hbli, ldxios = lrxios  )
+           CALL iom_get( numror, jpdom_autoglo, 'hbl' , hbl , ldxios = lroxios )
+           CALL iom_get( numror, jpdom_autoglo, 'hbli', hbli, ldxios = lroxios  )
            WRITE(numout,*) ' ===>>>> :  hbl & hbli read from restart file'
-           IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
+           IF( lroxios ) CALL iom_swap( TRIM(cxios_context) )
            RETURN
         ELSE                      ! 'hbl' & 'hbli' not in restart file, recalculate
            WRITE(numout,*) ' ===>>>> : previous run without osmosis scheme, hbl computed from stratification'
         END IF
-        IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
+        IF( lroxios ) CALL iom_swap( TRIM(cxios_context) )
      END IF
 

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdfric.F90

@@ -206 +206 @@
          !           !* Read the restart file
          IF( ln_rstart ) THEN
-            IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
+            IF( lroxios ) CALL iom_swap( TRIM(crxios_context) )
             id1 = iom_varid( numror, 'avt_k', ldstop = .FALSE. )
             id2 = iom_varid( numror, 'avm_k', ldstop = .FALSE. )
             !
             IF( MIN( id1, id2 ) > 0 ) THEN         ! restart exists => read it
-               CALL iom_get( numror, jpdom_autoglo, 'avt_k', avt_k, ldxios = lrxios )
-               CALL iom_get( numror, jpdom_autoglo, 'avm_k', avm_k, ldxios = lrxios )
+               CALL iom_get( numror, jpdom_autoglo, 'avt_k', avt_k, ldxios = lroxios )
+               CALL iom_get( numror, jpdom_autoglo, 'avm_k', avm_k, ldxios = lroxios )
             ENDIF
-            IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
+            IF( lroxios ) CALL iom_swap( TRIM(cxios_context) )
          ENDIF
          !           !* otherwise Kz already set to the background value in zdf_phy_init

NEMO/branches/2020/dev_12905_xios_restart/src/OCE/ZDF/zdftke.F90

@@ -659 +659 @@
          !                                   ! ---------------
          IF( ln_rstart ) THEN                   !* Read the restart file
-            IF( lrxios ) CALL iom_swap( TRIM(crxios_context) )
+            IF( lroxios ) CALL iom_swap( TRIM(crxios_context) )
             id1 = iom_varid( numror, 'en'   , ldstop = .FALSE. )
             id2 = iom_varid( numror, 'avt_k', ldstop = .FALSE. )
@@ -666 +666 @@
             !
             IF( MIN( id1, id2, id3, id4 ) > 0 ) THEN      ! fields exist
-               CALL iom_get( numror, jpdom_autoglo, 'en'   , en   , ldxios = lrxios )
-               CALL iom_get( numror, jpdom_autoglo, 'avt_k', avt_k, ldxios = lrxios )
-               CALL iom_get( numror, jpdom_autoglo, 'avm_k', avm_k, ldxios = lrxios )
-               CALL iom_get( numror, jpdom_autoglo, 'dissl', dissl, ldxios = lrxios )
+               CALL iom_get( numror, jpdom_autoglo, 'en'   , en   , ldxios = lroxios )
+               CALL iom_get( numror, jpdom_autoglo, 'avt_k', avt_k, ldxios = lroxios )
+               CALL iom_get( numror, jpdom_autoglo, 'avm_k', avm_k, ldxios = lroxios )
+               CALL iom_get( numror, jpdom_autoglo, 'dissl', dissl, ldxios = lroxios )
             ELSE                                          ! start TKE from rest
                IF(lwp) WRITE(numout,*)
@@ -677 +677 @@
                ! avt_k, avm_k already set to the background value in zdf_phy_init
             ENDIF
-            IF( lrxios ) CALL iom_swap( TRIM(cxios_context) )
+            IF( lroxios ) CALL iom_swap( TRIM(cxios_context) )
          ELSE                                   !* Start from rest
             IF(lwp) WRITE(numout,*)