Changeset 1938 for branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DYN

Timestamp:

2010-06-16T16:34:29+02:00 (14 years ago)

Author:

rfurner

Message:

rnf has been separated from emp and emps. Also temperature and salinity of runoff can be specified, and runoff can be added to a user specified depth

Location:

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DYN

Files:

• dynspg_flt.F90 (modified) (1 diff)
• dynspg_ts.F90 (modified) (1 diff)
• sshwzv.F90 (modified) (1 diff)

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

@@ -85 +85 @@
       !!         where (spgu,spgv) are given by:
       !!            spgu = vertical sum[ e3u (ub+ 2 rdt ua ) ]
-      !!                 - grav 2 rdt hu /e1u di[sshn + emp]
+      !!                 - grav 2 rdt hu /e1u di[sshn + (emp-rnf)]
       !!            spgv = vertical sum[ e3v (vb+ 2 rdt va) ]
-      !!                 - grav 2 rdt hv /e2v dj[sshn + emp]
+      !!                 - grav 2 rdt hv /e2v dj[sshn + (emp-rnf)]
       !!         and define the first guess from previous computation :
       !!            zbtd = btda

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

@@ -379 +379 @@
          DO jj = 2, jpjm1                                      ! leap-frog on ssh_e
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ssha_e(ji,jj) = ( zsshb_e(ji,jj) - z2dt_e * ( zraur * emp(ji,jj) + zhdiv(ji,jj) ) ) * tmask(ji,jj,1)
+               ssha_e(ji,jj) = ( zsshb_e(ji,jj) - z2dt_e * ( zraur * ( emp(ji,jj)-rnf(ji,jj) ) + zhdiv(ji,jj) ) ) * tmask(ji,jj,1) 
             END DO
          END DO

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

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