Changeset 12489 for NEMO/trunk/src/OCE/ISF

Timestamp:

2020-02-28T16:55:11+01:00 (4 years ago)

Author:

davestorkey

Message:

Preparation for new timestepping scheme #2390.
Main changes:

1. Initial euler timestep now handled in stp and not in TRA/DYN routines.
2. Renaming of all timestep parameters. In summary, the namelist parameter is now rn_Dt and the current timestep is rDt (and rDt_ice, rDt_trc etc).
3. Renaming of a few miscellaneous parameters, eg. atfp -> rn_atfp (namelist parameter used everywhere) and rau0 -> rho0.

This version gives bit-comparable results to the previous version of the trunk.

Location:

NEMO/trunk/src/OCE/ISF

Files:

• isfcav.F90 (modified) (4 diffs)
• isfcavmlt.F90 (modified) (4 diffs)
• isfcpl.F90 (modified) (2 diffs)
• isfdynatf.F90 (modified) (4 diffs)
• isfhdiv.F90 (modified) (2 diffs)
• isfpar.F90 (modified) (2 diffs)
• isfparmlt.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/ISF/isfcav.F90

@@ -24 +24 @@
    USE oce      , ONLY: ts                              ! ocean tracers
    USE par_oce  , ONLY: jpi,jpj                         ! ocean space and time domain
-   USE phycst   , ONLY: grav,rau0,rau0_rcp,r1_rau0_rcp  ! physical constants
+   USE phycst   , ONLY: grav,rho0,rho0_rcp,r1_rho0_rcp  ! physical constants
    USE eosbn2   , ONLY: ln_teos10                       ! use ln_teos10 or not
    !
@@ -85 +85 @@
       !
       ! initialisation
-      IF (TRIM(cn_gammablk) == 'vel_stab' ) zqoce_b (:,:) = ptsc(:,:,jp_tem) * rau0_rcp ! last time step total heat fluxes (to speed up convergence)
+      IF (TRIM(cn_gammablk) == 'vel_stab' ) zqoce_b (:,:) = ptsc(:,:,jp_tem) * rho0_rcp ! last time step total heat fluxes (to speed up convergence)
       !
       ! compute ice shelf melting
@@ -142 +142 @@
       !
       ! set temperature content
-      ptsc(:,:,jp_tem) = - zqh(:,:) * r1_rau0_rcp
+      ptsc(:,:,jp_tem) = - zqh(:,:) * r1_rho0_rcp
       !
       ! write restart variables (qoceisf, qhcisf, fwfisf for now and before)
@@ -215 +215 @@
             risf_lamb1 =-0.0564_wp
             risf_lamb2 = 0.0773_wp
-            risf_lamb3 =-7.8633e-8 * grav * rau0
+            risf_lamb3 =-7.8633e-8 * grav * rho0
          ELSE                  ! linearisation from table 4 (Asay-Davis et al., 2015)
             risf_lamb1 =-0.0573_wp
             risf_lamb2 = 0.0832_wp
-            risf_lamb3 =-7.5300e-8 * grav * rau0
+            risf_lamb3 =-7.5300e-8 * grav * rho0
          ENDIF
 

NEMO/trunk/src/OCE/ISF/isfcavmlt.F90

@@ -17 +17 @@
 
    USE dom_oce                            ! ocean space and time domain
-   USE phycst , ONLY: rcp, rau0, rau0_rcp ! physical constants
+   USE phycst , ONLY: rcp, rho0, rho0_rcp ! physical constants
    USE eosbn2 , ONLY: eos_fzp             ! equation of state
 
@@ -161 +161 @@
       !
       ! compute ocean-ice heat flux and then derive fwf assuming that ocean heat flux equal latent heat
-      pqfwf(:,:) = - pgt(:,:) * rau0_rcp * zthd(:,:) / rLfusisf    ! fresh water flux  ( > 0 out )
+      pqfwf(:,:) = - pgt(:,:) * rho0_rcp * zthd(:,:) / rLfusisf    ! fresh water flux  ( > 0 out )
       pqoce(:,:) = - pqfwf(:,:) * rLfusisf                         ! ocea-ice flux     ( > 0 out )
       pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp                 ! heat content flux ( > 0 out )
@@ -213 +213 @@
          !
          ! compute coeficient to solve the 2nd order equation
-         zeps1 = rau0_rcp * pgt(ji,jj)
-         zeps2 = rLfusisf * rau0 * pgs(ji,jj)
+         zeps1 = rho0_rcp * pgt(ji,jj)
+         zeps2 = rLfusisf * rho0 * pgs(ji,jj)
          zeps3 = rhoisf * rcpisf * rkappa / MAX(risfdep(ji,jj),zeps)
          zeps4 = risf_lamb2 + risf_lamb3 * risfdep(ji,jj)
@@ -238 +238 @@
          !
          ! compute the upward water and heat flux (eq. 24 and eq. 26)
-         pqfwf(ji,jj) = rau0     * pgs(ji,jj) * ( zsfrz - pstbl(ji,jj) ) / MAX(zsfrz,zeps) ! fresh water flux    (> 0 out)
-         pqoce(ji,jj) = rau0_rcp * pgt(ji,jj) * zthd (ji,jj)                               ! ocean-ice heat flux (> 0 out)
+         pqfwf(ji,jj) = rho0     * pgs(ji,jj) * ( zsfrz - pstbl(ji,jj) ) / MAX(zsfrz,zeps) ! fresh water flux    (> 0 out)
+         pqoce(ji,jj) = rho0_rcp * pgt(ji,jj) * zthd (ji,jj)                               ! ocean-ice heat flux (> 0 out)
          pqhc (ji,jj) = rcp      * pqfwf(ji,jj) * ztfrz(ji,jj)                             ! heat content   flux (> 0 out)
          !

NEMO/trunk/src/OCE/ISF/isfcpl.F90

@@ -68 +68 @@
       !
       ! start on an euler time step
-      neuler = 0
+      l_1st_euler = .TRUE.
       ! 
       ! allocation and initialisation to 0
@@ -502 +502 @@
       ! compute run length
       nstp_iscpl  = nitend - nit000 + 1
-      rdt_iscpl   = nstp_iscpl * rn_rdt
+      rdt_iscpl   = nstp_iscpl * rn_Dt
       z1_rdtiscpl = 1._wp / rdt_iscpl 
 

NEMO/trunk/src/OCE/ISF/isfdynatf.F90

@@ -13 +13 @@
    USE isf_oce
 
-   USE phycst , ONLY: r1_rau0         ! physical constant
+   USE phycst , ONLY: r1_rho0         ! physical constant
    USE dom_oce, ONLY: tmask, ssmask, ht, e3t, r1_e1e2t   ! time and space domain
 
@@ -39 +39 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pe3t_f   ! time filtered scale factor to be corrected
       !
-      REAL(wp)                        , INTENT(in   ) :: pcoef    ! atfp * rdt * r1_rau0
+      REAL(wp)                        , INTENT(in   ) :: pcoef    ! rn_atfp * rn_Dt * r1_rho0
       !!--------------------------------------------------------------------
       INTEGER :: jk  ! loop index
@@ -70 +70 @@
       REAL(wp), DIMENSION(jpi,jpj)    , INTENT(in   ) :: pfrac, phtbl    ! fraction of bottom cell included in tbl, tbl thickness
       REAL(wp), DIMENSION(jpi,jpj)    , INTENT(in   ) :: pfwf , pfwf_b   ! now/before fwf
-      REAL(wp),                         INTENT(in   ) :: pcoef           ! atfp * rdt * r1_rau0
+      REAL(wp),                         INTENT(in   ) :: pcoef           ! rn_atfp * rn_Dt * r1_rho0
       !!----------------------------------------------------------------------
       INTEGER :: ji,jj,jk
@@ -77 +77 @@
       !
       ! compute fwf conservation correction
-      zfwfinc(:,:) = pcoef * ( pfwf_b(:,:) - pfwf(:,:) ) / ( ht(:,:) + 1._wp - ssmask(:,:) ) * r1_rau0
+      zfwfinc(:,:) = pcoef * ( pfwf_b(:,:) - pfwf(:,:) ) / ( ht(:,:) + 1._wp - ssmask(:,:) ) * r1_rho0
       !
       ! add the increment

NEMO/trunk/src/OCE/ISF/isfhdiv.F90

@@ -16 +16 @@
 
    USE dom_oce                ! time and space domain
-   USE phycst , ONLY: r1_rau0 ! physical constant
+   USE phycst , ONLY: r1_rho0 ! physical constant
    USE in_out_manager         !
 
@@ -96 +96 @@
       !
       ! compute integrated divergence correction
-      zhdiv(:,:) = 0.5_wp * ( pfwf(:,:) + pfwf_b(:,:) ) * r1_rau0 / phtbl(:,:)
+      zhdiv(:,:) = 0.5_wp * ( pfwf(:,:) + pfwf_b(:,:) ) * r1_rho0 / phtbl(:,:)
       !
       ! update divergence at each level affected by ice shelf top boundary layer

NEMO/trunk/src/OCE/ISF/isfpar.F90

@@ -24 +24 @@
    USE dom_oce  , ONLY: bathy          ! ocean space and time domain
    USE par_oce  , ONLY: jpi,jpj        ! ocean space and time domain
-   USE phycst   , ONLY: r1_rau0_rcp    ! physical constants
+   USE phycst   , ONLY: r1_rho0_rcp    ! physical constants
    !
    USE in_out_manager ! I/O manager
@@ -88 +88 @@
       !
       ! set temperature content
-      ptsc(:,:,jp_tem) = zqh(:,:) * r1_rau0_rcp
+      ptsc(:,:,jp_tem) = zqh(:,:) * r1_rho0_rcp
       !
       ! write restart variables (qoceisf, qhcisf, fwfisf for now and before)

NEMO/trunk/src/OCE/ISF/isfparmlt.F90

@@ -13 +13 @@
    USE dom_oce                  ! ocean space and time domain
    USE oce    , ONLY: ts        ! ocean dynamics and tracers
-   USE phycst , ONLY: rcp, rau0 ! physical constants
+   USE phycst , ONLY: rcp, rho0 ! physical constants
    USE eosbn2 , ONLY: eos_fzp   ! equation of state
 
@@ -148 +148 @@
       !
       ! 2. ------------Net heat flux and fresh water flux due to the ice shelf
-      pqoce(:,:) =   rau0 * rcp * rn_gammat0 * risfLeff(:,:) * e1t(:,:) * ( ztavg(:,:) - ztfrz(:,:) ) * r1_e1e2t(:,:)
+      pqoce(:,:) =   rho0 * rcp * rn_gammat0 * risfLeff(:,:) * e1t(:,:) * ( ztavg(:,:) - ztfrz(:,:) ) * r1_e1e2t(:,:)
       pqfwf(:,:) = - pqoce(:,:) / rLfusisf             ! derived from the latent heat flux
       pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp     ! heat content flux