Changeset 2118

Timestamp:

2010-09-24T10:12:40+02:00 (14 years ago)

Author:

rfurner

Message:

changes to include volume flux in hdivn instead of ssha, currently not working correctly

Location:

branches/DEV_R1821_Rivers/NEMO/OPA_SRC

Files:

• DYN/divcur.F90 (modified) (5 diffs)
• DYN/sshwzv.F90 (modified) (1 diff)
• SBC/sbcrnf.F90 (modified) (1 diff)

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DYN/divcur.F90

@@ -16 +16 @@
    USE bdy_oce        ! Unstructured open boundaries variables
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+   USE sbcrnf, ONLY  : rnf_dep, rnf_mod_dep  ! River runoff
+   USE phycst,  ONLY : rau0                  ! physical constant
+   USE sbc_oce, ONLY : ln_rnf, rnf           ! surface boundary condition: ocean
 
    IMPLICIT NONE
@@ -89 +92 @@
       REAL(wp), DIMENSION(   jpi  ,1:jpj+2) ::   zwu   ! workspace
       REAL(wp), DIMENSION(-1:jpi+2,  jpj  ) ::   zwv   ! workspace
+      REAL(wp) ::  zraur,  zdep   ! temporary scalar
       !!----------------------------------------------------------------------
 
@@ -244 +248 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+
+      IF ( ln_rnf ) THEN
+      zraur = 1. / rau0
+        DO ji=1,jpi
+          DO jj=1,jpj
+            zdep = 1. / rnf_dep(ji,jj)
+            DO jk=1,rnf_mod_dep(ji,jj)
+              hdivn(ji,jj,jk) = hdivn(ji,jj,jk) - rnf(ji,jj)*zraur*zdep
+            ENDDO
+          ENDDO
+        ENDDO
+      ENDIF
       
       ! 4. Lateral boundary conditions on hdivn and rotn
@@ -301 +317 @@
       !! * Local declarations
       INTEGER  ::   ji, jj, jk          ! dummy loop indices
+      REAL(wp) ::  zraur,  zdep   ! temporary scalar
       !!----------------------------------------------------------------------
 
@@ -372 +389 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      
+
+      IF ( ln_rnf ) THEN
+      zraur = 1. / rau0
+        DO ji=1,jpi
+          DO jj=1,jpj
+            zdep = 1. / rnf_dep(ji,jj)
+            DO jk=1,rnf_mod_dep(ji,jj)
+              hdivn(ji,jj,jk) = hdivn(ji,jj,jk) - rnf(ji,jj)*zraur*zdep
+            ENDDO
+          ENDDO
+        ENDDO
+      ENDIF
+
       ! 4. Lateral boundary conditions on hdivn and rotn
       ! ---------------------------------=======---======

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -164 +164 @@
 
       !                                                ! Sea surface elevation time stepping
-      ssha(:,:) = (  sshb(:,:) - z2dt * ( zraur * ( emp(:,:)-rnf(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1) 
+      ssha(:,:) = (  sshb(:,:) - z2dt * ( zraur * emp(:,:) + zhdiv(:,:) )  ) * tmask(:,:,1)
 
 #if defined key_obc

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -50 +50 @@
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tmp_rnf    !: structure of input river runoff temperature (file information, fields read)  
  
-   REAL,    PUBLIC, DIMENSION(jpi,jpj) ::  rnf_dep         !: depth of runoff in m  
-   INTEGER, PUBLIC, DIMENSION(jpi,jpj) ::  rnf_mod_dep     !: depth of runoff in model levels  
-   REAL,    PUBLIC, DIMENSION(jpi,jpj) ::  rnf_sal         !: salinity of river runoff  
-   REAL,    PUBLIC, DIMENSION(jpi,jpj) ::  rnf_tmp         !: temperature of river runoff  
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::  rnf_dep         !: depth of runoff in m
+   INTEGER,  PUBLIC, DIMENSION(jpi,jpj) ::  rnf_mod_dep     !: depth of runoff in model levels
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::  rnf_sal         !: salinity of river runoff
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::  rnf_tmp         !: temperature of river runoff
   
    INTEGER  ::  ji, jj ,jk    ! dummy loop indices