New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 2107 – NEMO

Changeset 2107


Ignore:
Timestamp:
2010-09-21T14:30:20+02:00 (14 years ago)
Author:
mlelod
Message:

cosmetic changes again

Location:
branches/DEV_r1837_MLF/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/DEV_r1837_MLF/NEMO/OPA_SRC/DYN/sshwzv.F90

    r2068 r2107  
    156156      ! In forward Euler time stepping case, the same formulation as in the leap-frog case can be used 
    157157      ! because emp_b field is initialized with the vlaues of emp field. Hence, 0.5 * ( emp + emp_b ) = emp 
    158       IF( neuler == 0 .AND. kt == nit000 ) THEN 
    159          z1_rau0 = 1.e0 / rau0 
    160          ssha(:,:) = (  sshb(:,:) - z2dt * ( z1_rau0 *   emp(:,:)                + zhdiv(:,:) )  ) * tmask(:,:,1) 
    161       ELSE 
    162          z1_rau0 = 0.5 / rau0 
    163          ssha(:,:) = (  sshb(:,:) - z2dt * ( z1_rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1) 
    164       ENDIF 
     158      z1_rau0 = 0.5 / rau0 
     159      ssha(:,:) = (  sshb(:,:) - z2dt * ( z1_rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1) 
    165160 
    166161#if defined key_obc 
  • branches/DEV_r1837_MLF/NEMO/OPA_SRC/SBC/sbc_oce.F90

    r2091 r2107  
    4545   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   wndm              !: wind speed module at T-point (=|U10m-Uoce|)  [m/s] 
    4646   !! wndm is used only in PISCES to compute surface gases exchanges in ice-free ocean or leads 
    47    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   qsr    , qsr_b    !: sea heat flux:     solar                     [W/m2] 
     47   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   qsr               !: sea heat flux:     solar                     [W/m2] 
    4848   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   qns    , qns_b    !: sea heat flux: non solar                     [W/m2] 
    4949   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   qsr_tot           !: total     solar heat flux (over sea and ice) [W/m2] 
     
    5353   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   emp_tot           !: total E-P-R over ocean and ice               [Kg/m2/s] 
    5454   ! - ML - begin 
    55    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_hc_n          !: sbc heat content trend now                   [K/m/s] 
     55   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_hc_n          !: sbc heat content trend now                   [K.m/s] 
    5656   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_hc_b          !:  "   "      "      "   before                   " 
    57    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_sc_n          !: sbc salt content trend now                   [psu/m/s] 
     57   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_sc_n          !: sbc salt content trend now                   [psu.m/s] 
    5858   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_sc_b          !:  "   "      "      "   before                   " 
    59    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   qsr_hc_n      !: heat content trend due to qsr flux now       [K/m/s] 
     59   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   qsr_hc_n      !: heat content trend due to qsr flux now       [K.m/s] 
    6060   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   qsr_hc_b      !:  "      "      "    "  "   "   "   before       " 
    6161   ! - ML - end 
  • branches/DEV_r1837_MLF/NEMO/OPA_SRC/SBC/sbcmod.F90

    r2091 r2107  
    195195         vtau_b(:,:) = vtau(:,:)                         ! (except at nit000 where before fields 
    196196         qns_b (:,:) = qns (:,:)                         !  are set at the end of the routine) 
    197          qsr_b (:,:) = qsr (:,:) 
     197         ! The 3D heat content due to qsr forcing is treated in traqsr 
     198         ! qsr_b (:,:) = qsr (:,:) 
    198199         emp_b (:,:) = emp (:,:) 
    199200         emps_b(:,:) = emps(:,:) 
    200           
    201       ENDIF 
    202  
     201      ENDIF 
    203202      !                                            ! ---------------------------------------- ! 
    204203      !                                            !        forcing field computation         ! 
     
    259258            CALL iom_get( numror, jpdom_autoglo, 'vtau_b', vtau_b )   ! before j-stress  (V-point) 
    260259            CALL iom_get( numror, jpdom_autoglo, 'qns_b' , qns_b  )   ! before non solar heat flux (T-point) 
    261             CALL iom_get( numror, jpdom_autoglo, 'qsr_b' , qsr_b  )   ! before     solar heat flux (T-point) 
     260            ! The 3D heat content due to qsr forcing is treated in traqsr 
     261            ! CALL iom_get( numror, jpdom_autoglo, 'qsr_b' , qsr_b  )   ! before     solar heat flux (T-point) 
    262262            CALL iom_get( numror, jpdom_autoglo, 'emp_b' , emp_b  )   ! before     freshwater flux (T-point) 
    263263            CALL iom_get( numror, jpdom_autoglo, 'emps_b', emps_b )   ! before C/D freshwater flux (T-point) 
     
    283283         CALL iom_rstput( kt, nitrst, numrow, 'vtau_b' , vtau ) 
    284284         CALL iom_rstput( kt, nitrst, numrow, 'qns_b'  , qns  ) 
    285          CALL iom_rstput( kt, nitrst, numrow, 'qsr_b'  , qsr  ) 
     285         ! The 3D heat content due to qsr forcing is treated in traqsr 
     286         ! CALL iom_rstput( kt, nitrst, numrow, 'qsr_b'  , qsr  ) 
    286287         CALL iom_rstput( kt, nitrst, numrow, 'emp_b'  , emp  ) 
    287288         CALL iom_rstput( kt, nitrst, numrow, 'emps_b' , emps ) 
Note: See TracChangeset for help on using the changeset viewer.