Changeset 15464 for NEMO/branches/UKMO/r14075_ukmo_shelf

Timestamp:

2021-10-29T20:10:53+02:00 (3 years 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:

• DIA/diaptr.F90 (modified) (1 diff)
• IOM/iom.F90 (modified) (2 diffs)

NEMO/branches/UKMO/r14075_ukmo_shelf/src/OCE/DIA/diaptr.F90

@@ -307 +307 @@
          ENDIF
          !
-         IF( iom_use( 'uocetr_vsum_cumul' ) ) THEN
-            CALL iom_get_var(  'uocetr_vsum_op', z2d ) ! get uocetr_vsum_op from xml
-            z2d(:,:) = ptr_ci_2d( z2d(:,:) )  
-            CALL iom_put( 'uocetr_vsum_cumul', z2d )
-         ENDIF
+!         IF( iom_use( 'uocetr_vsum_cumul' ) ) THEN
+!            CALL iom_get_var(  'uocetr_vsum_op', z2d ) ! get uocetr_vsum_op from xml
+!            z2d(:,:) = ptr_ci_2d( z2d(:,:) )  
+!            CALL iom_put( 'uocetr_vsum_cumul', z2d )
+!         ENDIF
          !
       ENDIF

NEMO/branches/UKMO/r14075_ukmo_shelf/src/OCE/IOM/iom.F90

@@ -56 +56 @@
    LOGICAL, PUBLIC, PARAMETER ::   lk_iomput = .FALSE.       !: iom_put flag
 #endif
-   PUBLIC iom_init, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get, iom_get_var
+!   PUBLIC iom_init, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get, iom_get_var
+   PUBLIC iom_init, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get
    PUBLIC iom_chkatt, iom_getatt, iom_putatt, iom_getszuld, iom_rstput, iom_delay_rst, iom_put
    PUBLIC iom_use, iom_context_finalize, iom_miss_val
@@ -1350 +1351 @@
    END SUBROUTINE iom_get_123d
 
-   SUBROUTINE iom_get_var( cdname, z2d)
-      CHARACTER(LEN=*), INTENT(in ) ::   cdname
-      REAL(wp), DIMENSION(jpi,jpj) ::   z2d 
-#if defined key_iomput
-      IF( xios_field_is_active( cdname, at_current_timestep_arg = .TRUE. ) ) THEN
-         z2d(:,:) = 0._wp
-         CALL xios_recv_field( cdname, z2d)
-      ENDIF
-#else
-      IF( .FALSE. )   WRITE(numout,*) cdname, z2d ! useless test to avoid compilation warnings
-#endif
-   END SUBROUTINE iom_get_var
+!   SUBROUTINE iom_get_var( cdname, z2d)
+!      CHARACTER(LEN=*), INTENT(in ) ::   cdname
+!      REAL(wp), DIMENSION(jpi,jpj) ::   z2d 
+!#if defined key_iomput
+!      IF( xios_field_is_active( cdname, at_current_timestep_arg = .TRUE. ) ) THEN
+!         z2d(:,:) = 0._wp
+!         CALL xios_recv_field( cdname, z2d)
+!      ENDIF
+!#else
+!      IF( .FALSE. )   WRITE(numout,*) cdname, z2d ! useless test to avoid compilation warnings
+!#endif
+!   END SUBROUTINE iom_get_var