Changeset 12969 for NEMO/branches/2020/dev_12905_xios_restart/src/TOP/PISCES/SED/sedrst.F90

Timestamp:

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

Author:

andmirek

Message:

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

File:

• NEMO/branches/2020/dev_12905_xios_restart/src/TOP/PISCES/SED/sedrst.F90 (modified) (8 diffs)

NEMO/branches/2020/dev_12905_xios_restart/src/TOP/PISCES/SED/sedrst.F90

@@ -139 +139 @@
       zdta2 = 0.
 
-      IF(lrxios) CALL iom_swap(crsxios_context)
+      IF(lrsxios) CALL iom_swap(crsxios_context)
       DO jn = 1, jptrased
          cltra = TRIM(sedtrcd(jn))
          IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN
-            CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta(:,:,:,jn), ldxios = lrxios )
+            CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta(:,:,:,jn), ldxios = lrsxios )
          ELSE
             zdta(:,:,:,jn) = 0.0
@@ -162 +162 @@
          cltra = TRIM(seddia3d(jn))
          IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN
-            CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta1(:,:,:,jn), ldxios = lrxios )
+            CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta1(:,:,:,jn), ldxios = lrsxios )
          ELSE
             zdta1(:,:,:,jn) = 0.0
@@ -189 +189 @@
       cltra = "dbioturb"
       IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN
-         CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta2(:,:,:), ldxios = lrxios )
+         CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta2(:,:,:), ldxios = lrsxios )
       ELSE
          zdta2(:,:,:) = 0.0
@@ -199 +199 @@
       cltra = "irrig"
       IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN
-         CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta2(:,:,:), ldxios = lrxios )
+         CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta2(:,:,:), ldxios = lrsxios )
       ELSE
          zdta2(:,:,:) = 0.0
@@ -209 +209 @@
       cltra = "sedligand"
       IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN
-         CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta2(:,:,:), ldxios = lrxios )
+         CALL iom_get( numrsr, jpdom_autoglo, TRIM(cltra), zdta2(:,:,:), ldxios = lrsxios )
       ELSE
          zdta2(:,:,:) = 0.0
@@ -216 +216 @@
       CALL pack_arr( jpoce, sedligand(1:jpoce,1:jpksed), &
          &             zdta2(1:jpi,1:jpj,1:jpksed), iarroce(1:jpoce) )
-      IF(lrxios) CALL iom_swap(cxios_context)
+      IF(lrsxios) CALL iom_swap(cxios_context)
       IF( ln_timing )  CALL timing_stop('sed_rst_read')
      
@@ -382 +382 @@
             CALL iom_open( TRIM(cn_sedrst_indir)//'/'//cn_sedrst_in, numrsr )
 
-      IF( lrxios .AND. .NOT. lxios_sini) THEN
-          CALL ctl_stop('OCE and SED restart must be in a single file when XIOS is used to read restart')
-      ENDIF
-      IF( lrxios) THEN
-          crsxios_context = 'sed_rst'
-          IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS for SED'
-          IF( TRIM(Agrif_CFixed()) == '0' ) THEN
-             clpname = cn_sedrst_in
-          ELSE
-             clpname = TRIM(Agrif_CFixed())//"_"//cn_sedrst_in   
-          ENDIF
-          CALL iom_init( crsxios_context, fname = TRIM(cn_sedrst_indir)//'/'//TRIM(clpname), &
-                                          idfp = iom_file(numrsr)%nfid, ld_tmppatch = .TRUE. )
-      ENDIF
-            IF(lrxios) CALL iom_swap(crsxios_context)
-            CALL iom_get ( numrsr, 'kt', zkt, ldxios = lrxios )   ! last time-step of previous run
-            IF(lrxios) CALL iom_swap(cxios_context)
+            lrsxios = lrxios.AND.lxios_sini
+            IF( lrsxios) THEN
+                crsxios_context = 'sed_rst'
+                IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS for SED'
+                IF( TRIM(Agrif_CFixed()) == '0' ) THEN
+                   clpname = cn_sedrst_in
+                ELSE
+                   clpname = TRIM(Agrif_CFixed())//"_"//cn_sedrst_in   
+                ENDIF
+                CALL iom_init( crsxios_context, fname = TRIM(cn_sedrst_indir)//'/'//TRIM(clpname), &
+                                                idfp = iom_file(numrsr)%nfid, ld_tmppatch = .TRUE. )
+            ENDIF
+            IF(lrsxios) CALL iom_swap(crsxios_context)
+            CALL iom_get ( numrsr, 'kt', zkt, ldxios = lrsxios )   ! last time-step of previous run
+            IF(lrsxios) CALL iom_swap(cxios_context)
             IF(lwp) THEN
                WRITE(numsed,*) ' *** Info read in restart : '
@@ -419 +417 @@
             !                                          ! set the date in offline mode
             IF( ln_rst_sed .AND. nn_rstsed == 2 ) THEN
-               IF(lrxios) CALL iom_swap(crsxios_context)
-               CALL iom_get( numrsr, 'ndastp', zndastp, ldxios = lrxios )
+               IF(lrsxios) CALL iom_swap(crsxios_context)
+               CALL iom_get( numrsr, 'ndastp', zndastp, ldxios = lrsxios )
                ndastp = NINT( zndastp )
-               CALL iom_get( numrsr, 'adatrj', adatrj, ldxios = lrxios  )
-               IF(lrxios) CALL iom_swap(crxios_context)
+               CALL iom_get( numrsr, 'adatrj', adatrj, ldxios = lrsxios  )
+               IF(lrsxios) CALL iom_swap(crxios_context)
              ELSE
                ndastp = ndate0 - 1     ! ndate0 read in the namelist in dom_nam