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

Changeset 8026


Ignore:
Timestamp:
2017-05-15T17:54:57+02:00 (7 years ago)
Author:
lovato
Message:

3.6 stable: solve ticket #1835 and add following fixes (tested with SETTE):

  • add key_offline control in zdfddm_substitute.h90
  • use loop index in rab2d as in rab3d, and take out lbc calls
  • make atm_co2 always accessible from sbc_oce
  • update sette scripts for athena cluster
Location:
branches/2015/nemo_v3_6_STABLE/NEMOGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90

    r7607 r8026  
    122122   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   sprecip           !: solid precipitation                          [Kg/m2/s] 
    123123   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   fr_i              !: ice fraction = 1 - lead fraction      (between 0 to 1) 
    124 #if defined key_cpl_carbon_cycle 
    125124   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   atm_co2           !: atmospheric pCO2                             [ppm] 
    126 #endif 
    127125   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: xcplmask          !: coupling mask for ln_mixcpl (warning: allocated in sbccpl) 
    128126 
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

    r6506 r8026  
    697697      CASE( -1, 0 )                !==  polynomial TEOS-10 / EOS-80 ==! 
    698698         ! 
    699          DO jj = 1, jpjm1 
    700             DO ji = 1, fs_jpim1   ! vector opt. 
     699         DO jj = 1, jpj 
     700            DO ji = 1, jpi 
    701701               ! 
    702702               zh  = pdep(ji,jj) * r1_Z0                                  ! depth 
     
    750750         END DO 
    751751         ! 
    752          CALL lbc_lnk( pab(:,:,jp_tem), 'T', 1. )                    ! Lateral boundary conditions 
    753          CALL lbc_lnk( pab(:,:,jp_sal), 'T', 1. )                     
    754          ! 
    755752      CASE( 1 )                  !==  simplified EOS  ==! 
    756753         ! 
    757          DO jj = 1, jpjm1 
    758             DO ji = 1, fs_jpim1   ! vector opt. 
     754         DO jj = 1, jpj 
     755            DO ji = 1, jpi 
    759756               ! 
    760757               zt    = pts  (ji,jj,jp_tem) - 10._wp   ! pot. temperature anomaly (t-T0) 
     
    770767            END DO 
    771768         END DO 
    772          ! 
    773          CALL lbc_lnk( pab(:,:,jp_tem), 'T', 1. )                    ! Lateral boundary conditions 
    774          CALL lbc_lnk( pab(:,:,jp_sal), 'T', 1. )                     
    775769         ! 
    776770      CASE DEFAULT 
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm_substitute.h90

    r4152 r8026  
    55   !!      with a constant or 1D or 2D or 3D array, using CPP macro. 
    66   !!---------------------------------------------------------------------- 
    7 #if defined key_zdfddm 
     7#if defined key_zdfddm && ! defined key_offline 
    88!   'key_zdfddm' :                      avs: 3D array defined in zdfddm module 
    99#   define   fsavs(i,j,k)       avs(i,j,k) 
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90

    r5385 r8026  
    2323   PUBLIC   trc_oce_alloc      ! function called by nemogcm.F90 
    2424 
    25    INTEGER , PUBLIC                                      ::   nn_dttrc      !: frequency of step on passive tracers 
     25   INTEGER , PUBLIC                                      ::   nn_dttrc = 1  !: frequency of step on passive tracers 
    2626   REAL(wp), PUBLIC                                      ::   r_si2         !: largest depth of extinction (blue & 0.01 mg.m-3)  (RGB) 
    2727   REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   etot3         !: light absortion coefficient 
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena

    r6408 r8026  
    44#BSUB -n NPROCS 
    55#BSUB -a poe 
    6 #BSUB -J MPI_config 
     6#BSUB -J NEMO_SETTE 
    77#BSUB -o poe.stdout.%J 
    88#BSUB -e poe.stderr.%J 
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena_xios

    r6408 r8026  
    44#BSUB -n TOTAL_NPROCS 
    55#BSUB -a poe 
    6 #BSUB -J MPI_config 
     6#BSUB -J NEMO_SETTE 
    77#BSUB -o poe.stdout.%J 
    88#BSUB -e poe.stderr.%J 
Note: See TracChangeset for help on using the changeset viewer.