Changeset 11454

Timestamp:

2019-08-19T17:28:27+02:00 (5 years ago)

Author:

jcastill

Message:

Final changes to make the branch work in uncoupled mode

File:

• branches/UKMO/r6232_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (4 diffs)

branches/UKMO/r6232_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -56 +56 @@
    INTEGER                    ::   OASIS_ToRest      = -1
    INTEGER                    ::   OASIS_ToRestOut   = -1
-   INTEGER                    ::   OASIS_Recvd       = -1
-   INTEGER                    ::   OASIS_RecvOut     = -1
-   INTEGER                    ::   OASIS_FromRest    = -1
-   INTEGER                    ::   OASIS_FromRestOut = -1
+   INTEGER, PUBLIC            ::   OASIS_Recvd       = -1
+   INTEGER, PUBLIC            ::   OASIS_RecvOut     = -1
+   INTEGER, PUBLIC            ::   OASIS_FromRest    = -1
+   INTEGER, PUBLIC            ::   OASIS_FromRestOut = -1
+
+   PUBLIC oasis_get
+
+   INTERFACE oasis_def_var
+      MODULE PROCEDURE oasis_def_var_1d, oasis_def_var_2d
+   END INTERFACE
+
+   INTERFACE oasis_get
+      MODULE PROCEDURE oasis_get_1d, oasis_get_2d
+   END INTERFACE
 #endif
 
@@ -542 +552 @@
    END SUBROUTINE oasis_def_partition
 
-   SUBROUTINE oasis_def_var(k1,cd1,k2,k3,k4,k5,k6,k7)
+   SUBROUTINE oasis_def_var_1d(k1,cd1,k2,k3,k4,k5,k6,k7)
       CHARACTER(*), INTENT(in   ) ::  cd1
-      INTEGER     , INTENT(in   ) ::  k2,k3(2),k4,k5(2,2),k6
+      INTEGER     , INTENT(in   ) ::  k2,k3(2),k4,k6
+      INTEGER,      INTENT(in   ) ::  k5(:)
       INTEGER     , INTENT(  out) ::  k1,k7
       k1 = -1 ; k7 = -1
       WRITE(numout,*) 'oasis_def_var: Error you sould not be there...', cd1
-   END SUBROUTINE oasis_def_var
+   END SUBROUTINE oasis_def_var_1d
+
+   SUBROUTINE oasis_def_var_2d(k1,cd1,k2,k3,k4,k5,k6,k7)
+      CHARACTER(*), INTENT(in   ) ::  cd1
+      INTEGER     , INTENT(in   ) ::  k2,k3(2),k4,k6
+      INTEGER,      INTENT(in   ) ::  k5(:,:)
+      INTEGER     , INTENT(  out) ::  k1,k7
+      k1 = -1 ; k7 = -1
+      WRITE(numout,*) 'oasis_def_var: Error you sould not be there...', cd1
+   END SUBROUTINE oasis_def_var_2d
 
    SUBROUTINE oasis_enddef(k1)
@@ -564 +584 @@
    END SUBROUTINE oasis_put
 
-   SUBROUTINE oasis_get(k1,k2,p1,k3)
+   SUBROUTINE oasis_get_1d(k1,k2,p1,k3)
+      REAL(wp), DIMENSION(:)  , INTENT(  out) ::  p1
+      INTEGER                 , INTENT(in   ) ::  k1,k2
+      INTEGER                 , INTENT(  out) ::  k3
+      p1(1) = -1. ; k3 = -1
+      WRITE(numout,*) 'oasis_get: Error you sould not be there...'
+   END SUBROUTINE oasis_get_1d
+
+   SUBROUTINE oasis_get_2d(k1,k2,p1,k3)
       REAL(wp), DIMENSION(:,:), INTENT(  out) ::  p1
       INTEGER                 , INTENT(in   ) ::  k1,k2
@@ -570 +598 @@
       p1(1,1) = -1. ; k3 = -1
       WRITE(numout,*) 'oasis_get: Error you sould not be there...'
-   END SUBROUTINE oasis_get
+   END SUBROUTINE oasis_get_2d
 
    SUBROUTINE oasis_get_freqs(k1,k2,k3,k4)