Ignore:
Timestamp:
2020-02-26T11:02:35+01:00 (15 months ago)
Author:
davestorkey
Message:

2020/KERNEL-03_Storkey_Coward_RK3_stage2:

  1. Alter ABL, ICE and TOP timestepping variables to be consistent with new schema: rdt_abl —> rDt_abl rdt_ice —> rDt_ice r1_rdt_ice —> r1_Dt_ice rdttrc —> rn_Dt (always equal to ocean timestep parameter in namelist) r2dttrc —> rDt_trc (current tracer timestep)
  2. Reinstate rn_scal_load (revert previous change): rn_load —> rn_scal_load

Passes SETTE and bit compares with the trunk@12436.

Location:
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/OCE
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/OCE/ASM/asminc.F90

    r12406 r12468  
    10001000! 
    10011001!      !            !  salt exchanges at the ice/ocean interface 
    1002 !      !            zpmess         = zfons / rdt_ice    ! rdt_ice is ice timestep 
     1002!      !            zpmess         = zfons / rDt_ice    ! rDt_ice is ice timestep 
    10031003!      ! 
    10041004!      !! Adjust fsalt. A +ve fsalt means adding salt to ocean 
  • NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/OCE/DYN/dynspg.F90

    r12443 r12468  
    123123            ! 
    124124            IF (ln_scal_load) THEN 
    125                zld = rn_load * grav 
     125               zld = rn_scal_load * grav 
    126126               DO_2D_00_00 
    127127                  spgu(ji,jj) = spgu(ji,jj) + zld * ( pssh(ji+1,jj,Kmm) - pssh(ji,jj,Kmm) ) * r1_e1u(ji,jj) 
  • NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/OCE/DYN/dynspg_ts.F90

    r12443 r12468  
    552552         ! 
    553553         !                             ! Surface pressure gradient 
    554          zldg = ( 1._wp - rn_load ) * grav    ! local factor 
     554         zldg = ( 1._wp - rn_scal_load ) * grav    ! local factor 
    555555         DO_2D_00_00 
    556556            zu_spg(ji,jj) = - zldg * ( zsshp2_e(ji+1,jj) - zsshp2_e(ji,jj) ) * r1_e1u(ji,jj) 
  • NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/OCE/TDE/tide_mod.F90

    r12443 r12468  
    6464   INTEGER , PUBLIC ::   nb_harmo            !: Number of active tidal components 
    6565   REAL(wp), PUBLIC ::   rn_tide_ramp_dt     !: 
    66    REAL(wp), PUBLIC ::   rn_load        !: 
     66   REAL(wp), PUBLIC ::   rn_scal_load        !: 
    6767   CHARACTER(lc), PUBLIC ::   cn_tide_load   !:  
    6868   REAL(wp)         ::   rn_tide_gamma       ! Tidal tilt factor 
     
    124124      NAMELIST/nam_tide/ln_tide, nn_tide_var, ln_tide_dia, ln_tide_pot, rn_tide_gamma, & 
    125125         &              ln_scal_load, ln_read_load, cn_tide_load,         & 
    126          &              ln_tide_ramp, rn_load, rn_tide_ramp_dt,      & 
     126         &              ln_tide_ramp, rn_scal_load, rn_tide_ramp_dt,      & 
    127127         &              sn_tide_cnames 
    128128      !!---------------------------------------------------------------------- 
     
    153153            WRITE(numout,*) '         Read load potential from file           ln_read_load    = ', ln_read_load 
    154154            WRITE(numout,*) '         Apply ramp on tides at startup          ln_tide_ramp    = ', ln_tide_ramp 
    155             WRITE(numout,*) '         Fraction of SSH used in scal. approx.   rn_load    = ', rn_load 
     155            WRITE(numout,*) '         Fraction of SSH used in scal. approx.   rn_scal_load    = ', rn_scal_load 
    156156            WRITE(numout,*) '         Duration (days) of ramp                 rn_tide_ramp_dt = ', rn_tide_ramp_dt 
    157157         ENDIF 
    158158      ELSE 
    159          rn_load = 0._wp  
     159         rn_scal_load = 0._wp  
    160160 
    161161         IF(lwp) WRITE(numout,*) 
     
    193193      IF( nb_harmo == 0 )   CALL ctl_stop( 'tide_init : No tidal components set in nam_tide' ) 
    194194      ! 
    195       IF (.NOT.ln_scal_load ) rn_load = 0._wp 
     195      IF (.NOT.ln_scal_load ) rn_scal_load = 0._wp 
    196196      ! 
    197197      ALLOCATE( amp_pot(jpi,jpj,nb_harmo),                      & 
     
    754754      ! 
    755755      IF( ln_tide_dia ) THEN          ! Output total tidal potential (incl. load potential) 
    756          IF ( iom_use( "tide_pot" ) ) CALL iom_put( "tide_pot", pot_astro(:,:) + rn_load * ssh(:,:,Kmm) ) 
     756         IF ( iom_use( "tide_pot" ) ) CALL iom_put( "tide_pot", pot_astro(:,:) + rn_scal_load * ssh(:,:,Kmm) ) 
    757757      END IF 
    758758      ! 
Note: See TracChangeset for help on using the changeset viewer.