Changeset 1227

Timestamp:

2008-12-01T07:52:11+01:00 (15 years ago)

Author:

smasson

Message:

minor bugfix for new coupling interface (continue changeset:1226), see ticket:155

Location:

trunk/NEMO/OPA_SRC/SBC

Files:

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

trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -34 +34 @@
    USE dom_oce                      ! ocean space and time domain
    USE in_out_manager               ! I/O manager
-   USE lib_mpp
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    IMPLICIT NONE
    PRIVATE
 !
-   INTEGER, PUBLIC            :: nlocalComm
    LOGICAL, PUBLIC, PARAMETER :: lk_cpl = .TRUE.   ! coupled flag
    INTEGER                    :: ncomp_id          ! id returned by prism_init_comp
@@ -222 +220 @@
       ! snd data to OASIS3
       !
-      IF( lk_mpp ) THEN   ;   CALL prism_put_proto ( ssnd(kid)%nid, kstep, pdata(nldi:nlei, nldj:nlej), kinfo )
-      ELSE                ;   CALL prism_put_proto ( ssnd(kid)%nid, kstep, pdata                      , kinfo )
-      ENDIF
+      CALL prism_put_proto ( ssnd(kid)%nid, kstep, pdata(nldi:nlei, nldj:nlej), kinfo )
       
       IF ( ln_ctl ) THEN        
@@ -271 +267 @@
       IF ( llaction ) THEN
 
-         IF( lk_mpp ) THEN   ;   pdata(nldi:nlei, nldj:nlej) = exfld(:,:)
-         ELSE                ;   pdata(    :    ,     :    ) = exfld(:,:)
-         ENDIF
+         pdata(nldi:nlei, nldj:nlej) = exfld(:,:)
          
          !--- Fill the overlap areas and extra hallows (mpp)

trunk/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -950 +950 @@
 !!gm  cpl_albedo ???? kezako ?????   je pige pas grand chose ici....
          pqsr_ice(:,:) = frcv(:,:,jpr_qsrmix) * ( 1.- palbi(:,:) )   &
-            &          / (  1.- ( cpl_ocean_albedo(ji,jj) * ( 1.- p_frld(ji,jj) )   &
-            &                   + palbi           (ji,jj) *       p_frld(ji,jj)   )  )
+            &          / (  1.- ( albedo_oce_mix(ji,jj) * ( 1.- p_frld(ji,jj) )   &
+            &                   + palbi         (ji,jj) *       p_frld(ji,jj)   )  )
       END SELECT
 
@@ -1147 +1147 @@
       &                                pqns_tot, pqns_ice,         &
       &                                pqsr_tot, pqsr_ice,         &
-      &                                pemp_tot, pemp_ice, psprecip )
+      &                                pemp_tot, pemp_ice, pdqns_ice, psprecip )
       REAL(wp), INTENT(in   ), DIMENSION(:,:) ::   p_frld     ! lead fraction                [0 to 1]
       REAL(wp), INTENT(in   ), DIMENSION(:,:) ::   palbi      ! ice albedo
@@ -1158 +1158 @@
       REAL(wp), INTENT(  out), DIMENSION(:,:) ::   pemp_tot   ! total     freshwater budget  [Kg/m2/s]
       REAL(wp), INTENT(  out), DIMENSION(:,:) ::   pemp_ice   ! ice solid freshwater budget  [Kg/m2/s]
+      REAL(wp), INTENT(  out), DIMENSION(:,:) ::   pdqns_ice  ! d(Q non solar)/d(Temperature) over ice
       REAL(wp), INTENT(  out), DIMENSION(:,:) ::   psprecip   ! solid precipitation          [Kg/m2/s]
       WRITE(*,*) 'sbc_cpl_snd: You should not have seen this print! error?', p_frld(1,1), palbi(1,1), psst(1,1), pist(1,1)
       ! stupid definition to avoid warning message when compiling...
-      pqns_tot(:,:) = 0. ; pqns_ice(:,:) = 0. 
+      pqns_tot(:,:) = 0. ; pqns_ice(:,:) = 0. ; pdqns_ice(:,:) = 0.
       pqsr_tot(:,:) = 0. ; pqsr_ice(:,:) = 0. 
       pemp_tot(:,:) = 0. ; pemp_ice(:,:) = 0. ; psprecip(:,:) = 0.