Changeset 1698 for trunk

Timestamp:

2009-10-31T14:19:38+01:00 (14 years ago)

Author:

smasson

Message:

compatibility between oasis3 and oasis4, see ticket:580

Location:

trunk/NEMO/OPA_SRC/SBC

Files:

• cpl_oasis3.F90 (modified) (3 diffs)
• sbccpl.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -39 +39 @@
 !
    LOGICAL, PUBLIC, PARAMETER :: lk_cpl = .TRUE.   ! coupled flag
+   INTEGER, PUBLIC            :: OASIS_Rcv  = 1    ! return code if received field
+   INTEGER, PUBLIC            :: OASIS_idle = 0    ! return code if nothing done by oasis
    INTEGER                    :: ncomp_id          ! id returned by prism_init_comp
    INTEGER                    :: nerror            ! return error code
@@ -267 +269 @@
       IF ( llaction ) THEN
 
+         kinfo = OASIS_Rcv
          pdata(nldi:nlei, nldj:nlej) = exfld(:,:)
          
@@ -285 +288 @@
          ENDIF
       
+      ELSE
+         kinfo = OASIS_idle     
       ENDIF
 

trunk/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -30 +30 @@
    USE ice_2           ! ice variables
 #endif
+#if defined key_oasis3
    USE cpl_oasis3      ! OASIS3 coupling
+#endif
+#if defined key_oasis4
+   USE cpl_oasis4      ! OASIS4 coupling
+#endif
    USE geo2ocean       ! 
    USE restart         !
@@ -40 +45 @@
    USE lib_mpp         ! distribued memory computing library
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-   USE mod_prism_proto ! OASIS3 prism module: PRISM_* variables...
    USE phycst, ONLY : xlsn, rhosn
 #if defined key_cpl_carbon_cycle
@@ -241 +245 @@
       !   Define the receive interface   !
       ! ================================ !
-      nrcvinfo(:) = PRISM_NotDef   ! needed by nrcvinfo(jpr_otx1) if we do not receive ocea stress 
+      nrcvinfo(:) = OASIS_idle   ! needed by nrcvinfo(jpr_otx1) if we do not receive ocean stress 
 
       ! for each field: define the OASIS name                              (srcv(:)%clname)
@@ -585 +589 @@
          ! define frcv(:,:,jpr_otx1) and frcv(:,:,jpr_oty1): stress at U/V point along model grid
          ! => need to be done only when we receive the field
-         IF(  nrcvinfo(jpr_otx1) == PRISM_Recvd   .OR. nrcvinfo(jpr_otx1) == PRISM_FromRest .OR.   &
-            & nrcvinfo(jpr_otx1) == PRISM_RecvOut .OR. nrcvinfo(jpr_otx1) == PRISM_FromRestOut ) THEN
+         IF(  nrcvinfo(jpr_otx1) == OASIS_Rcv ) THEN
             !
             IF( TRIM( cn_rcv_tau(2) ) == 'cartesian' ) THEN            ! 2 components on the sphere
@@ -661 +664 @@
          ENDIF
       ELSE
-         llnewtau = nrcvinfo(jpr_taum) == PRISM_Recvd   .OR. nrcvinfo(jpr_taum) == PRISM_FromRest .OR.   &
-                  & nrcvinfo(jpr_taum) == PRISM_RecvOut .OR. nrcvinfo(jpr_taum) == PRISM_FromRestOut
+         llnewtau = OASIS_Rcv
       ENDIF
       
@@ -799 +801 @@
 
       ! do something only if we just received the stress from atmosphere
-      IF(  nrcvinfo(itx) == PRISM_Recvd   .OR. nrcvinfo(itx) == PRISM_FromRest .OR.   &
-         & nrcvinfo(itx) == PRISM_RecvOut .OR. nrcvinfo(itx) == PRISM_FromRestOut ) THEN
+      IF(  nrcvinfo(itx) == OASIS_Rcv ) THEN
 
          !                                                      ! ======================= !