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.
ticket/0684 (diff) – NEMO

Changes between Version 13 and Version 14 of ticket/0684


Ignore:
Timestamp:
2010-07-09T17:15:40+02:00 (14 years ago)
Author:
acc
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0684

    v13 v14  
    414414 
    415415Next increase the dimensionality of fnow in sbcrnf.F90 where code from the Rivers branch needs to be made compatible with the changes introduced by the 3DF branch. 
    416 Simply change fnow(:,:) to fnow(:,:,1) and fnow(jpi,jpj) to fnow(jpi,jpj,1) [3 occurrences of each]. 
     416Simply change fnow(:,:) to fnow(:,:,1) and fnow(jpi,jpj) to fnow(jpi,jpj,1) [3 occurrences of each]. Do the same for fdta which has also gained a dimension. 
     417Move declaration of ierror down into sbc_rnf_init where it is now needed following the relocation of the allocate statements (step 7 change) 
     418Move the definition of lk_mpp_rep in dom_oce.F90 above the agrif declarations since the current location ends up in an executable section following the merge 
     419Code now compiles successfully (ORCA2_LIM without any of the new options active). Check in and continue testing. 
     420 
     421{{{ 
     422 
     423svn ci -m"ticket #684 step 9a: Code fixes to achieve first successful compilation of mid-year merge code" 
     424}}} 
     425 
    417426=== Testing === 
    418427