Changeset 15023 for NEMO/trunk/src/OCE/SBC/fldread.F90

Timestamp:

2021-06-18T16:35:25+02:00 (3 years ago)

Author:

gsamson

Message:

merge ticket2680_C1D_PAPA branch back into the trunk; see ticket #2680 for details

File:

• NEMO/trunk/src/OCE/SBC/fldread.F90 (modified) (3 diffs)

NEMO/trunk/src/OCE/SBC/fldread.F90

@@ -38 +38 @@
    USE ioipsl  , ONLY : ymds2ju, ju2ymds   ! for calendar
    USE lib_mpp        ! MPP library
-   USE lbclnk         ! ocean lateral boundary conditions (C1D case)
+   USE lbclnk         ! ocean lateral boundary conditions (online interpolation case)
    
    IMPLICIT NONE
@@ -356 +356 @@
       INTEGER ::   idvar    ! variable ID
       INTEGER ::   idmspc   ! number of spatial dimensions
-      LOGICAL ::   lmoor    ! C1D case: point data
       REAL(wp), DIMENSION(:,:,:), POINTER ::   dta_alias   ! short cut
       !!---------------------------------------------------------------------
@@ -374 +373 @@
          CALL lbc_lnk( 'fldread', dta_alias(:,:,:), sdjf%cltype, sdjf%zsgn, kfillmode = jpfillcopy )
       ELSE                                          ! default case
-         ! C1D case: If product of spatial dimensions == ipk, then x,y are of
-         ! size 1 (point/mooring data): this must be read onto the central grid point
          idvar  = iom_varid( sdjf%num, sdjf%clvar )
          idmspc = iom_file ( sdjf%num )%ndims( idvar )
          IF( iom_file( sdjf%num )%luld( idvar ) )   idmspc = idmspc - 1   ! id of the last spatial dimension
-         lmoor  = (  idmspc == 0 .OR. PRODUCT( iom_file( sdjf%num )%dimsz( 1:MAX(idmspc,1) ,idvar ) ) == ipk  )    
-         !
-         IF( lk_c1d .AND. lmoor ) THEN
-            CALL iom_get( sdjf%num, jpdom_unknown, sdjf%clvar, dta_alias(2,2,:), sdjf%nrec(1,iaa) )   ! jpdom_unknown -> no lbc_lnk
-            CALL lbc_lnk( 'fldread', dta_alias(:,:,:), 'T', 1., kfillmode = jpfillcopy )
-         ELSE
-            CALL iom_get( sdjf%num,  jpdom_global, sdjf%clvar, dta_alias(:,:,:), sdjf%nrec(1,iaa),   &
-               &          sdjf%cltype, sdjf%zsgn, kfill = jpfillcopy )
-         ENDIF
+         CALL iom_get( sdjf%num,  jpdom_global, sdjf%clvar, dta_alias(:,:,:), sdjf%nrec(1,iaa),   &
+            &          sdjf%cltype, sdjf%zsgn, kfill = jpfillcopy )
       ENDIF
       !