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

Changeset 6824


Ignore:
Timestamp:
2016-07-28T15:36:29+02:00 (8 years ago)
Author:
clem
Message:

update from trunk

Location:
branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/ARCH/arch-X64_ADA.fcm

    r6204 r6824  
    3333%NCDF_HOME           /smplocal/pub/NetCDF/4.1.3/mpi 
    3434%HDF5_HOME           /smplocal/pub/HDF5/1.8.9/par 
    35 %XIOS_HOME           $WORKDIR/XIOS 
     35%XIOS_HOME           $WORKDIR/XIOS2 
    3636####%OASIS_HOME          $WORKDIR/oasis3-mct/BLD 
    3737%OASIS_HOME          /not/defined 

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm

    r5385 r6824  
    1  bld::tool::fppkeys key_trabbl key_lim3 key_vvl key_dynspg_ts key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobs key_asminc  
     1 bld::tool::fppkeys key_xios2 key_mpp_rep key_trabbl key_lim3 key_vvl key_dynspg_ts key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobs key_asminc  

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/CONFIG/cfg.txt

    r6348 r6824  
    88ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC 
    99ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 
    10 ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC 
    1110GYRE OPA_SRC 
    1211ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC 
     12ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC 
     13SPITZ OPA_SRC LIM_SRC_3 

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

    r6204 r6824  
    480480 
    481481            nblendta(1:jpbgrd,ib_bdy) =  (nbdyend - nbdybeg + 1) * nn_rimwidth(ib_bdy) 
    482             jpbdtas = MAX(jpbdtas, (nbdyend - nbdybeg + 1)) 
     482            jpbdtas = MAX(jpbdtas, (nbdyend - nbdybeg + 1) * nn_rimwidth(ib_bdy)) 
    483483            IF (lwp.and.(nn_rimwidth(ib_bdy)>nrimmax)) & 
    484484            & CALL ctl_stop( 'rimwidth must be lower than nrimmax' ) 

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

    r5215 r6824  
    120120      ! first entry with narea for this processor is left hand interior index 
    121121      ! last  entry                               is right hand interior index 
    122       jj = jpj/2 
     122      jj = nlcj/2 
    123123      nicbdi = -1 
    124124      nicbei = -1 
    … …  
    136136      ! 
    137137      ! repeat for j direction 
    138       ji = jpi/2 
     138      ji = nlci/2 
    139139      nicbdj = -1 
    140140      nicbej = -1 
    … …  
    153153      ! special for east-west boundary exchange we save the destination index 
    154154      i1 = MAX( nicbdi-1, 1) 
    155       i3 = INT( src_calving(i1,jpj/2) ) 
     155      i3 = INT( src_calving(i1,nlcj/2) ) 
    156156      jj = INT( i3/nicbpack ) 
    157157      ricb_left = REAL( i3 - nicbpack*jj, wp ) 
    158158      i1 = MIN( nicbei+1, jpi ) 
    159       i3 = INT( src_calving(i1,jpj/2) ) 
     159      i3 = INT( src_calving(i1,nlcj/2) ) 
    160160      jj = INT( i3/nicbpack ) 
    161161      ricb_right = REAL( i3 - nicbpack*jj, wp ) 
    … …  
    196196         WRITE(numicb,*) 'berg left       ', ricb_left 
    197197         WRITE(numicb,*) 'berg right      ', ricb_right 
    198          jj = jpj/2 
     198         jj = nlcj/2 
    199199         WRITE(numicb,*) "central j line:" 
    200200         WRITE(numicb,*) "i processor" 
    … …  
    202202         WRITE(numicb,*) "i point" 
    203203         WRITE(numicb,*) (INT(src_calving(ji,jj)), ji=1,jpi) 
    204          ji = jpi/2 
     204         ji = nlci/2 
    205205         WRITE(numicb,*) "central i line:" 
    206206         WRITE(numicb,*) "j processor" 

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90

    r6763 r6824  
    225225      IF( MOD( kt - 1, nn_fsbc ) == 0 )   THEN 
    226226         qlw_ice(:,:,1)   = sf(jp_qlw)%fnow(:,:,1)  
    227          qsr_ice(:,:,1)   = sf(jp_qsr)%fnow(:,:,1) 
     227         IF( ln_dm2dc ) THEN  ;  qsr_ice(:,:,1) = sbc_dcy(sf(jp_qsr)%fnow(:,:,1) ) 
     228         ELSE                 ;  qsr_ice(:,:,1) = sf(jp_qsr)%fnow(:,:,1) 
     229         ENDIF   
    228230         tatm_ice(:,:)    = sf(jp_tair)%fnow(:,:,1)          
    229231         qatm_ice(:,:)    = sf(jp_humi)%fnow(:,:,1) 

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/TOOLS/COMPILE/tools.txt

    r5608 r6824  
    1 SIREN  
     1WEIGHTS  

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/TOOLS/NESTING/agulhas

    r6204 r6824  
    4141    N  = 31 
    4242    ldbletanh   = .FALSE. 
    43     ppa2        = 0.0 
     43    pa2         = 0.0 
    4444    ppkth2      = 0.0 
    4545    ppacr2      = 0.0 

  • branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/TOOLS/NESTING/src/agrif_types.f90

    r6204 r6824  
    7676  NAMELIST /nesting/imin,imax,jmin,jmax,rho,rhot,bathy_update,updated_parent_file       
    7777  ! 
    78   NAMELIST /vertical_grid/ppkth,ppacr,ppdzmin,pphmax,psur,pa0,pa1,N,ldbletanh,ppa2,ppkth2,ppacr2 
     78  NAMELIST /vertical_grid/ppkth,ppacr,ppdzmin,pphmax,psur,pa0,pa1,N,ldbletanh,pa2,ppkth2,ppacr2 
    7979  !  
    8080  NAMELIST /partial_cells/partial_steps,parent_bathy_meter,parent_batmet_name,e3zps_min,e3zps_rat       
Note: See TracChangeset for help on using the changeset viewer.