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 5259 – NEMO

Changeset 5259


Ignore:
Timestamp:
2015-05-11T16:45:31+02:00 (9 years ago)
Author:
smasson
Message:

dev_r5218_CNRS17_coupling: merge with trunk rev 5258

Location:
branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_vardef.sh.500yfwb0

    r4394 r5259  
    114114export VAR1_Ithick  V1It_PREF    V1It_SUFF 
    115115export VAR1_SNOW    V1SNOW_PREF  V1SNOW_SUFF 
    116 export VAR1_IvelV   V1IvV_PREF   V1IvV_PREF 
     116export VAR1_IvelV   V1IvV_PREF   V1IvV_SUFF 
    117117#===================== EXP2 ===================== 
    118118export DATE1_2      DATE2_2 
    … …  
    127127export VAR2_Ithick  V2It_PREF    V2It_SUFF 
    128128export VAR2_SNOW    V2SNOW_PREF  V2SNOW_SUFF 
    129 export VAR2_IvelV   V2IvV_PREF   V2IvV_PREF 
     129export VAR2_IvelV   V2IvV_PREF   V2IvV_SUFF 
    130130# 

  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_vardef.sh.500yfwb2

    r4394 r5259  
    114114export VAR1_Ithick  V1It_PREF    V1It_SUFF 
    115115export VAR1_SNOW    V1SNOW_PREF  V1SNOW_SUFF 
    116 export VAR1_IvelV   V1IvV_PREF   V1IvV_PREF 
     116export VAR1_IvelV   V1IvV_PREF   V1IvV_SUFF 
    117117#===================== EXP2 ===================== 
    118118export DATE1_2      DATE2_2 
    … …  
    127127export VAR2_Ithick  V2It_PREF    V2It_SUFF 
    128128export VAR2_SNOW    V2SNOW_PREF  V2SNOW_SUFF 
    129 export VAR2_IvelV   V2IvV_PREF   V2IvV_PREF 
     129export VAR2_IvelV   V2IvV_PREF   V2IvV_SUFF 
    130130# 

  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_vardef.sh_example1

    r4394 r5259  
    112112export VAR1_Ithick  V1It_PREF    V1It_SUFF 
    113113export VAR1_SNOW    V1SNOW_PREF  V1SNOW_SUFF 
    114 export VAR1_IvelV   V1IvV_PREF   V1IvV_PREF 
     114export VAR1_IvelV   V1IvV_PREF   V1IvV_SUFF 
    115115#===================== EXP2 ===================== 
    116116export DATE1_2      DATE2_2 
    … …  
    125125export VAR2_Ithick  V2It_PREF   V2It_SUFF 
    126126export VAR2_SNOW    V2SNOW_PREF V2SNOW_SUFF 
    127 export VAR2_IvelV   V2IvV_PREF   V2IvV_PREF 
     127export VAR2_IvelV   V2IvV_PREF   V2IvV_SUFF 
    128128# 

  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_vardef.sh_example2

    r4394 r5259  
    112112export VAR1_Ithick  V1It_PREF    V1It_SUFF 
    113113export VAR1_SNOW    V1SNOW_PREF  V1SNOW_SUFF 
    114 export VAR1_IvelV   V1IvV_PREF   V1IvV_PREF 
     114export VAR1_IvelV   V1IvV_PREF   V1IvV_SUFF 
    115115#===================== EXP2 ===================== 
    116116export DATE1_2      DATE2_2 
    … …  
    125125export VAR2_Ithick  V2It_PREF   V2It_SUFF 
    126126export VAR2_SNOW    V2SNOW_PREF V2SNOW_SUFF 
    127 export VAR2_IvelV   V2IvV_PREF   V2IvV_PREF 
     127export VAR2_IvelV   V2IvV_PREF   V2IvV_SUFF 
    128128# 

  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90

    r5121 r5259  
    2121   USE timing         ! preformance summary 
    2222   USE wrk_nemo       ! working arrays 
     23   USE fldread        ! type FLD_N 
     24   USE phycst         ! physical constant 
     25   USE in_out_manager  ! I/O manager 
    2326 
    2427   IMPLICIT NONE 
    … …  
    208211      REAL(wp) ::   zztmp   
    209212      REAL(wp), POINTER, DIMENSION(:,:,:,:) ::   zsaldta   ! Jan/Dec levitus salinity 
     213      ! reading initial file 
     214      LOGICAL  ::   ln_tsd_init      !: T & S data flag 
     215      LOGICAL  ::   ln_tsd_tradmp    !: internal damping toward input data flag 
     216      CHARACTER(len=100)            ::   cn_dir 
     217      TYPE(FLD_N)                   ::  sn_tem,sn_sal 
     218      INTEGER  ::   ios=0 
     219 
     220      NAMELIST/namtsd/ ln_tsd_init,ln_tsd_tradmp,cn_dir,sn_tem,sn_sal 
     221      ! 
     222 
     223      REWIND( numnam_ref )              ! Namelist namtsd in reference namelist : 
     224      READ  ( numnam_ref, namtsd, IOSTAT = ios, ERR = 901) 
     225901   IF( ios /= 0 ) CALL ctl_nam ( ios , ' namtsd in reference namelist for dia_ar5', lwp ) 
     226      REWIND( numnam_cfg )              ! Namelist namtsd in configuration namelist : Parameters of the run 
     227      READ  ( numnam_cfg, namtsd, IOSTAT = ios, ERR = 902 ) 
     228902   IF( ios /= 0 ) CALL ctl_nam ( ios , ' namtsd in configuration namelist for dia_ar5', lwp ) 
     229      IF(lwm) WRITE ( numond, namtsd ) 
     230      ! 
    210231      !!---------------------------------------------------------------------- 
    211232      ! 
    … …  
    227248      END DO 
    228249      IF( lk_mpp )   CALL mpp_sum( vol0 ) 
    229        
    230       CALL iom_open ( 'data_1m_salinity_nomask', inum ) 
    231       CALL iom_get  ( inum, jpdom_data, 'vosaline', zsaldta(:,:,:,1), 1  ) 
    232       CALL iom_get  ( inum, jpdom_data, 'vosaline', zsaldta(:,:,:,2), 12 ) 
     250 
     251      CALL iom_open ( TRIM( cn_dir )//TRIM(sn_sal%clname), inum ) 
     252      CALL iom_get  ( inum, jpdom_data, TRIM(sn_sal%clvar), zsaldta(:,:,:,1), 1  ) 
     253      CALL iom_get  ( inum, jpdom_data, TRIM(sn_sal%clvar), zsaldta(:,:,:,2), 12 ) 
    233254      CALL iom_close( inum ) 
    234255      sn0(:,:,:) = 0.5_wp * ( zsaldta(:,:,:,1) + zsaldta(:,:,:,2) )         

  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

    r5120 r5259  
    956956      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zdept, zrhh 
    957957      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp 
     958      REAL(wp), POINTER, DIMENSION(:,:)   ::   zsshu_n, zsshv_n 
    958959      !!---------------------------------------------------------------------- 
    959960      ! 
    960961      CALL wrk_alloc( jpi,jpj,jpk, zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp ) 
    961962      CALL wrk_alloc( jpi,jpj,jpk, zdept, zrhh ) 
     963      CALL wrk_alloc( jpi,jpj, zsshu_n, zsshv_n ) 
    962964      ! 
    963965      IF( kt == nit000 ) THEN 
    … …  
    10401042 
    10411043      ! Z coordinate of U(ji,jj,1:jpkm1) and V(ji,jj,1:jpkm1) 
     1044 
     1045      ! Prepare zsshu_n and zsshv_n 
    10421046      DO jj = 2, jpjm1 
    10431047        DO ji = 2, jpim1 
    1044           zu(ji,jj,1) = - ( fse3u(ji,jj,1) - sshn(ji,jj) * znad)    ! probable bug: changed from sshu_n for ztilde compilation 
    1045           zv(ji,jj,1) = - ( fse3v(ji,jj,1) - sshn(ji,jj) * znad)    ! probable bug: changed from sshv_n for ztilde compilation 
     1048          zsshu_n(ji,jj) = (e12u(ji,jj) * sshn(ji,jj) + e12u(ji+1, jj) * sshn(ji+1,jj)) * & 
     1049                         & r1_e12u(ji,jj) * umask(ji,jj,1) * 0.5_wp  
     1050          zsshv_n(ji,jj) = (e12v(ji,jj) * sshn(ji,jj) + e12v(ji+1, jj) * sshn(ji,jj+1)) * & 
     1051                         & r1_e12v(ji,jj) * vmask(ji,jj,1) * 0.5_wp  
     1052        END DO 
     1053      END DO 
     1054 
     1055      DO jj = 2, jpjm1 
     1056        DO ji = 2, jpim1 
     1057          zu(ji,jj,1) = - ( fse3u(ji,jj,1) - zsshu_n(ji,jj) * znad)  
     1058          zv(ji,jj,1) = - ( fse3v(ji,jj,1) - zsshv_n(ji,jj) * znad) 
    10461059        END DO 
    10471060      END DO 
    … …  
    12051218      CALL wrk_dealloc( jpi,jpj,jpk, zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp ) 
    12061219      CALL wrk_dealloc( jpi,jpj,jpk, zdept, zrhh ) 
     1220      CALL wrk_dealloc( jpi,jpj, zsshu_n, zsshv_n ) 
    12071221      ! 
    12081222   END SUBROUTINE hpg_prj 
Note: See TracChangeset for help on using the changeset viewer.