New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 15464 – NEMO

Changeset 15464


Ignore:
Timestamp:
2021-10-29T20:10:53+02:00 (7 months ago)
Author:
jcastill
Message:

Remove dependency with XIOS 2.5 so that we can run in coupled mode with WWIII 4.18 at the Met Office

Location:
NEMO/branches/UKMO/r14075_ukmo_shelf/src/OCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/r14075_ukmo_shelf/src/OCE/DIA/diaptr.F90

    r14075 r15464  
    307307         ENDIF 
    308308         ! 
    309          IF( iom_use( 'uocetr_vsum_cumul' ) ) THEN 
    310             CALL iom_get_var(  'uocetr_vsum_op', z2d ) ! get uocetr_vsum_op from xml 
    311             z2d(:,:) = ptr_ci_2d( z2d(:,:) )   
    312             CALL iom_put( 'uocetr_vsum_cumul', z2d ) 
    313          ENDIF 
     309!         IF( iom_use( 'uocetr_vsum_cumul' ) ) THEN 
     310!            CALL iom_get_var(  'uocetr_vsum_op', z2d ) ! get uocetr_vsum_op from xml 
     311!            z2d(:,:) = ptr_ci_2d( z2d(:,:) )   
     312!            CALL iom_put( 'uocetr_vsum_cumul', z2d ) 
     313!         ENDIF 
    314314         ! 
    315315      ENDIF 
  • NEMO/branches/UKMO/r14075_ukmo_shelf/src/OCE/IOM/iom.F90

    r14075 r15464  
    5656   LOGICAL, PUBLIC, PARAMETER ::   lk_iomput = .FALSE.       !: iom_put flag 
    5757#endif 
    58    PUBLIC iom_init, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get, iom_get_var 
     58!   PUBLIC iom_init, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get, iom_get_var 
     59   PUBLIC iom_init, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get 
    5960   PUBLIC iom_chkatt, iom_getatt, iom_putatt, iom_getszuld, iom_rstput, iom_delay_rst, iom_put 
    6061   PUBLIC iom_use, iom_context_finalize, iom_miss_val 
     
    13501351   END SUBROUTINE iom_get_123d 
    13511352 
    1352    SUBROUTINE iom_get_var( cdname, z2d) 
    1353       CHARACTER(LEN=*), INTENT(in ) ::   cdname 
    1354       REAL(wp), DIMENSION(jpi,jpj) ::   z2d  
    1355 #if defined key_iomput 
    1356       IF( xios_field_is_active( cdname, at_current_timestep_arg = .TRUE. ) ) THEN 
    1357          z2d(:,:) = 0._wp 
    1358          CALL xios_recv_field( cdname, z2d) 
    1359       ENDIF 
    1360 #else 
    1361       IF( .FALSE. )   WRITE(numout,*) cdname, z2d ! useless test to avoid compilation warnings 
    1362 #endif 
    1363    END SUBROUTINE iom_get_var 
     1353!   SUBROUTINE iom_get_var( cdname, z2d) 
     1354!      CHARACTER(LEN=*), INTENT(in ) ::   cdname 
     1355!      REAL(wp), DIMENSION(jpi,jpj) ::   z2d  
     1356!#if defined key_iomput 
     1357!      IF( xios_field_is_active( cdname, at_current_timestep_arg = .TRUE. ) ) THEN 
     1358!         z2d(:,:) = 0._wp 
     1359!         CALL xios_recv_field( cdname, z2d) 
     1360!      ENDIF 
     1361!#else 
     1362!      IF( .FALSE. )   WRITE(numout,*) cdname, z2d ! useless test to avoid compilation warnings 
     1363!#endif 
     1364!   END SUBROUTINE iom_get_var 
    13641365 
    13651366 
Note: See TracChangeset for help on using the changeset viewer.