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 1528 for trunk/NEMO/OPA_SRC/DIA/diawri.F90 – NEMO

Ignore:
Timestamp:
2009-07-23T16:38:47+02:00 (15 years ago)
Author:
rblod
Message:

Suppress rigid-lid option, see ticket #486

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMO/OPA_SRC/DIA/diawri.F90

    r1498 r1528  
    2222   USE zdfddm          ! vertical  physics: double diffusion 
    2323   USE diahth          ! thermocline diagnostics 
    24    USE diaspr          ! surface pressure diagnostics (rigid lid case) 
    2524   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    2625   USE in_out_manager  ! I/O manager 
     
    287286         CALL histdef( nid_T, "sosaline", "Sea Surface Salinity"               , "PSU"    ,   &  ! sss 
    288287            &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout ) 
    289 #if defined key_dynspg_rl 
    290          CALL histdef( nid_T, "sobarstf","Barotropic StreamFunction"           , "m3/s2"  ,   &  ! bsf 
    291             &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout ) 
    292 #else 
    293288         CALL histdef( nid_T, "sossheig", "Sea Surface Height"                 , "m"      ,   &  ! ssh 
    294289            &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout ) 
    295 #endif 
    296 !!$#if ! defined key_dynspg_rl && ( defined key_lim3 || defined key_lim2 ) 
     290!!$#if defined key_lim3 || defined key_lim2  
    297291!!$         ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to 
    298292!!$         !    internal damping to Levitus that can be diagnosed from others 
     
    381375         CALL histdef( nid_U, "sozotaux", "Wind Stress along i-axis"           , "N/m2"   ,   &  ! utau 
    382376            &          jpi, jpj, nh_U, 1  , 1, 1  , - 99, 32, clop, zsto, zout ) 
    383 #if defined key_dynspg_rl 
    384          CALL histdef( nid_U, "sozospgx", "Zonal Surface Pressure Gradient"    , "N/kg"   ,   &  ! spgu 
    385             &          jpi, jpj, nh_U, 1  , 1, 1  , - 99, 32, clop, zsto, zout ) 
    386 #endif 
    387377 
    388378         CALL histend( nid_U ) 
     
    398388         CALL histdef( nid_V, "sometauy", "Wind Stress along j-axis"           , "N/m2"   ,   &  ! vtau 
    399389            &          jpi, jpj, nh_V, 1  , 1, 1  , - 99, 32, clop, zsto, zout ) 
    400 #if defined key_dynspg_rl 
    401          CALL histdef( nid_V, "somespgy", "Meridional Surface Pressure Grad."  , "N/kg"   ,   &  ! spgv 
    402             &          jpi, jpj, nh_V, 1  , 1, 1  , - 99, 32, clop, zsto, zout ) 
    403 #endif 
    404390 
    405391         CALL histend( nid_V ) 
     
    469455      CALL histwrite( nid_T, "sosstsst", it, tn(:,:,1)     , ndim_hT, ndex_hT )   ! sea surface temperature 
    470456      CALL histwrite( nid_T, "sosaline", it, sn(:,:,1)     , ndim_hT, ndex_hT )   ! sea surface salinity 
    471 #if defined key_dynspg_rl 
    472       CALL histwrite( nid_T, "sobarstf", it, bsfn          , ndim_hT, ndex_hT )   ! barotropic streamfunction 
    473 #else 
    474457      CALL histwrite( nid_T, "sossheig", it, sshn          , ndim_hT, ndex_hT )   ! sea surface height 
    475 #endif 
    476 !!$#if ! defined key_dynspg_rl && ( defined key_lim3 || defined key_lim2 ) 
     458!!$#if  defined key_lim3 || defined key_lim2  
    477459!!$      CALL histwrite( nid_T, "iowaflup", it, fsalt(:,:)    , ndim_hT, ndex_hT )   ! ice=>ocean water flux 
    478460!!$      CALL histwrite( nid_T, "sowaflep", it, fmass(:,:)    , ndim_hT, ndex_hT )   ! atmos=>ocean water flux 
     
    529511#endif 
    530512      CALL histwrite( nid_U, "sozotaux", it, utau          , ndim_hU, ndex_hU )   ! i-wind stress 
    531 #if defined key_dynspg_rl 
    532       CALL lbc_lnk( spgu, 'U', -1. ) 
    533       CALL histwrite( nid_U, "sozospgx", it, spgu          , ndim_hU, ndex_hU )   ! i-surf. press. grad. 
    534 #endif 
    535513 
    536514         ! Write fields on V grid 
     
    540518#endif 
    541519      CALL histwrite( nid_V, "sometauy", it, vtau          , ndim_hV, ndex_hV )   ! j-wind stress 
    542 #if defined key_dynspg_rl 
    543       CALL lbc_lnk( spgv, 'V', -1. ) 
    544       CALL histwrite( nid_V, "somespgy", it, spgv          , ndim_hV, ndex_hV )   ! j-surf. pressure grad. 
    545 #endif 
    546520 
    547521         ! Write fields on W grid 
     
    651625      CALL histdef( id_i, "votemper", "Temperature"           , "C"      ,   &   ! temperature 
    652626         &          jpi, jpj, nh_i, jpk, 1, jpk, nz_i, 32, clop, zsto, zout ) 
    653 #if defined key_dynspg_rl 
    654       CALL histdef( id_i, "sobarstf","Barotropic StreamFunction", "m3/s2"  ,   &  ! bsf 
    655          &          jpi, jpj, nh_i, 1  , 1, 1  , nz_i, 32, clop, zsto, zout ) 
    656 #else 
    657627      CALL histdef( id_i, "sossheig", "Sea Surface Height"    , "m"      ,   &  ! ssh 
    658628         &          jpi, jpj, nh_i, 1  , 1, 1  , nz_i, 32, clop, zsto, zout ) 
    659 #endif 
    660629      CALL histdef( id_i, "vozocrtx", "Zonal Current"         , "m/s"    ,   &   ! zonal current 
    661630         &          jpi, jpj, nh_i, jpk, 1, jpk, nz_i, 32, clop, zsto, zout ) 
     
    693662      CALL histwrite( id_i, "votemper", kt, tn      , jpi*jpj*jpk, idex )    ! now temperature 
    694663      CALL histwrite( id_i, "vosaline", kt, sn      , jpi*jpj*jpk, idex )    ! now salinity 
    695 #if defined key_dynspg_rl 
    696       CALL histwrite( id_i, "sobarstf", kt, bsfn     , jpi*jpj    , idex )    ! barotropic streamfunction 
    697 #else 
    698664      CALL histwrite( id_i, "sossheig", kt, sshn     , jpi*jpj    , idex )    ! sea surface height 
    699 #endif 
    700665      CALL histwrite( id_i, "vozocrtx", kt, un       , jpi*jpj*jpk, idex )    ! now i-velocity 
    701666      CALL histwrite( id_i, "vomecrty", kt, vn       , jpi*jpj*jpk, idex )    ! now j-velocity 
Note: See TracChangeset for help on using the changeset viewer.