Changeset 13871 for NEMO/branches/2020/dev_12905_xios_restart/src/TOP/trcrst.F90

Timestamp:

2020-11-25T12:51:29+01:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2462: Addressing reviewr comments stage 1

File:

• NEMO/branches/2020/dev_12905_xios_restart/src/TOP/trcrst.F90 (modified) (9 diffs)

NEMO/branches/2020/dev_12905_xios_restart/src/TOP/trcrst.F90

@@ -96 +96 @@
          ELSE
 #if defined key_iomput
-            cwtxios_context = "rstwt_"//TRIM(ADJUSTL(clkt))
+            cw_toprst_cxt = "rstwt_"//TRIM(ADJUSTL(clkt))
             IF( TRIM(Agrif_CFixed()) == '0' ) THEN
                clpname = clname
@@ -102 +102 @@
                clpname = TRIM(Agrif_CFixed())//"_"//clname
             ENDIF
-            CALL iom_init( cwtxios_context, fname = TRIM(clpath)//TRIM(clpname), ld_closedef = .FALSE. )
+            CALL iom_init( cw_toprst_cxt, fname = TRIM(clpath)//TRIM(clpname), ld_closedef = .FALSE. )
             CALL iom_swap(      cxios_context          )
 #else
@@ -130 +130 @@
 
       ! READ prognostic variables and computes diagnostic variable
-      IF(lrtxios) CALL iom_swap(crtxios_context)
+      IF(lrxios) CALL iom_swap(cr_toprst_cxt)
       DO jn = 1, jptra
-         CALL iom_get( numrtr, jpdom_auto, 'TRN'//ctrcnm(jn), tr(:,:,:,jn,Kmm), ldxios = lrtxios )
+         CALL iom_get( numrtr, jpdom_auto, 'TRN'//ctrcnm(jn), tr(:,:,:,jn,Kmm), ldxios = lrxios )
       END DO
 
       DO jn = 1, jptra
-         CALL iom_get( numrtr, jpdom_auto, 'TRB'//ctrcnm(jn), tr(:,:,:,jn,Kbb), ldxios = lrtxios )
+         CALL iom_get( numrtr, jpdom_auto, 'TRB'//ctrcnm(jn), tr(:,:,:,jn,Kbb), ldxios = lrxios )
       END DO
       !
       CALL iom_delay_rst( 'READ', 'TOP', numrtr )   ! read only TOP delayed global communication variables
-      IF(lrtxios) CALL iom_swap(cxios_context) 
+      IF(lrxios) CALL iom_swap(cxios_context) 
    END SUBROUTINE trc_rst_read
 
@@ -155 +155 @@
       !!----------------------------------------------------------------------
       !
-      IF( lwxios ) CALL iom_swap(      cwtxios_context         )
+      IF( lwxios ) CALL iom_swap(      cw_toprst_cxt         )
       CALL iom_rstput( kt, nitrst, numrtw, 'rdttrc1', rn_Dt, ldxios = lwxios )   ! passive tracer time step (= ocean time step)
       ! prognostic variables 
@@ -173 +173 @@
           CALL trc_rst_stat( Kmm, Krhs )             ! statistics
           IF(lwxios) THEN
-             CALL iom_context_finalize(      cwtxios_context          )
+             CALL iom_context_finalize(      cw_toprst_cxt          )
           ELSE
              CALL iom_close( numrtw )     ! close the restart file (only at last time step)
@@ -234 +234 @@
             lxios_sini = .FALSE.
             CALL iom_open( TRIM(cn_trcrst_indir)//'/'//cn_trcrst_in, numrtr )
-            lrtxios = lrxios.AND.lxios_sini
-            IF( lrtxios) THEN
-                crtxios_context = 'top_rst'
+            IF( lrxios) THEN
+                cr_toprst_cxt = 'top_rst'
                 IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS for TOP'
                 IF( TRIM(Agrif_CFixed()) == '0' ) THEN
@@ -243 +242 @@
                    clpname = TRIM(Agrif_CFixed())//"_"//cn_trcrst_in   
                 ENDIF
-                CALL iom_init( crtxios_context, fname = TRIM(cn_trcrst_indir)//'/'//TRIM(clpname), &
+                CALL iom_init( cr_toprst_cxt, fname = TRIM(cn_trcrst_indir)//'/'//TRIM(clpname), &
                                           idfp = iom_file(numrtr)%nfid, ld_closedef = .TRUE. )
             ENDIF
 
-            IF(lrtxios) CALL iom_swap(crtxios_context)
-            CALL iom_get ( numrtr, 'kt', zkt, ldxios = lrtxios )   ! last time-step of previous run
-            IF(lrtxios) CALL iom_swap(cxios_context)
+            IF(lrxios) CALL iom_swap(cr_toprst_cxt)
+            CALL iom_get ( numrtr, 'kt', zkt, ldxios = lrxios )   ! last time-step of previous run
+            IF(lrxios) CALL iom_swap(cxios_context)
 
             IF(lwp) THEN
@@ -271 +270 @@
             !                                          ! set the date in offline mode
             IF( ln_rsttr .AND. nn_rsttr == 2 ) THEN
-               IF(lrtxios) CALL iom_swap(crtxios_context)
-               CALL iom_get( numrtr, 'ndastp', zndastp, ldxios = lrtxios )
+               IF(lrxios) CALL iom_swap(cr_toprst_cxt)
+               CALL iom_get( numrtr, 'ndastp', zndastp, ldxios = lrxios )
                ndastp = NINT( zndastp )
-               CALL iom_get( numrtr, 'adatrj', adatrj, ldxios = lrtxios  )
-               CALL iom_get( numrtr, 'ntime' , ktime, ldxios = lrtxios   )
-               IF(lrtxios) CALL iom_swap(cxios_context)
+               CALL iom_get( numrtr, 'adatrj', adatrj, ldxios = lrxios  )
+               CALL iom_get( numrtr, 'ntime' , ktime, ldxios = lrxios   )
+               IF(lrxios) CALL iom_swap(cxios_context)
                nn_time0=INT(ktime)
                ! calculate start time in hours and minutes
@@ -336 +335 @@
             IF(lwp) WRITE(numout,*) '~~~~~~~'
          ENDIF
-         IF( lwxios ) CALL iom_swap(      cwtxios_context         )
+         IF( lwxios ) CALL iom_swap(      cw_toprst_cxt         )
          CALL iom_rstput( kt, nitrst, numrtw, 'kt'     , REAL( kt    , wp)  , ldxios = lwxios )   ! time-step
          CALL iom_rstput( kt, nitrst, numrtw, 'ndastp' , REAL( ndastp, wp)  , ldxios = lwxios )   ! date