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

Changeset 10477


Ignore:
Timestamp:
2019-01-09T11:04:59+01:00 (5 years ago)
Author:
frrh
Message:

Merge changes from branches/UKMO/dev_r5518_GO6_fix_top_ref to address code
and namelist issues causing problems at NIWA.
Command:
svn merge -r 10434:10469 svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_fix_top_ref

Location:
branches/UKMO/dev_r5518_GO6_package/NEMOGCM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_ref

    r9163 r10477  
    102102   ln_trdtrc(1)  =   .true. 
    103103   ln_trdtrc(2)  =   .true. 
    104    ln_trdtrc(23) =   .true. 
    105104/ 
    106105!----------------------------------------------------------------------- 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/namelist_top_ref

    r9163 r10477  
    102102   ln_trdtrc(1)  =   .true. 
    103103   ln_trdtrc(2)  =   .true. 
    104    ln_trdtrc(23) =   .true. 
    105104/ 
    106105!----------------------------------------------------------------------- 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90

    r10149 r10477  
    436436      !! 
    437437      INTEGER,                      INTENT(in   ) :: knum       ! i/o unit 
    438       CHARACTER(LEN=13),            INTENT(in   ) :: cd_bgcname ! variable 
     438      CHARACTER(LEN=*),             INTENT(in   ) :: cd_bgcname ! variable 
    439439      REAL(wp), DIMENSION(jpi,jpj), INTENT(  out) :: p_incs     ! increments 
    440440      !! 
     
    474474      !! 
    475475      INTEGER,                          INTENT(in   ) :: knum       ! i/o unit 
    476       CHARACTER(LEN=13),                INTENT(in   ) :: cd_bgcname ! variable 
     476      CHARACTER(LEN=*),                 INTENT(in   ) :: cd_bgcname ! variable 
    477477      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(  out) :: p_incs     ! increments 
    478478      !! 
     
    894894      REAL(wp), DIMENSION(kcycper), INTENT(IN) :: pwgtiau   ! IAU weights 
    895895      ! 
    896       INTEGER                      :: jk          ! Loop counter 
    897896      INTEGER                      :: it          ! Index 
    898897      REAL(wp)                     :: zincwgt     ! IAU weight for current time step 
     
    18441843      REAL(wp), DIMENSION(kcycper), INTENT(IN) :: pwgtiau   ! IAU weights 
    18451844      ! 
    1846       INTEGER  :: jk              ! Loop counter 
    18471845      INTEGER  :: it              ! Index 
    18481846      REAL(wp) :: zincwgt         ! IAU weight for current time step 
    1849       REAL(wp) :: zincper         ! IAU interval in seconds 
    18501847      !!---------------------------------------------------------------------- 
    18511848 
Note: See TracChangeset for help on using the changeset viewer.