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 6140 for trunk/NEMOGCM/fcm-make – NEMO

Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (9 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

Location:
trunk/NEMOGCM/fcm-make/inc
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/fcm-make/inc/keys-amm12.cfg

    r5930 r6140  
    11preprocess.prop{fpp.defs} = \ 
    2   key_bdy key_tide key_ldfslp key_zdfgls key_vvl key_diainstant key_mpp_mpi key_iomput 
     2  key_bdy key_tide key_dynspg_ts key_ldfslp key_zdfgls key_vvl key_diainstant key_mpp_mpi key_iomput 

  • trunk/NEMOGCM/fcm-make/inc/keys-gyre.cfg

    r5930 r6140  
    11preprocess.prop{fpp.defs} = \ 
    2   key_ldfslp key_zdftke key_iomput key_mpp_mpi key_nosignedzero 
     2  key_dynspg_flt key_ldfslp key_zdftke key_iomput key_mpp_mpi key_nosignedzero 

  • trunk/NEMOGCM/fcm-make/inc/keys-gyre_pisces.cfg

    r5930 r6140  
    11preprocess.prop{fpp.defs} = \ 
    2   key_ldfslp key_zdftke key_top key_pisces_reduced key_iomput key_mpp_mpi 
     2  key_dynspg_flt key_ldfslp key_zdftke key_top key_pisces_reduced key_iomput key_mpp_mpi 

  • trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg

    r5930 r6140  
    11preprocess.prop{fpp.defs} = \ 
    2   key_trabbl key_lim2 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 
     2  key_trabbl key_lim2 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_asminc 

  • trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg

    r5930 r6140  
    11preprocess.prop{fpp.defs} = \ 
    2   key_trabbl key_lim3 key_vvl 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 
     2  key_trabbl key_lim3 key_vvl 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_asminc 

  • trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim_cfc.cfg

    r5930 r6140  
    11preprocess.prop{fpp.defs} = \ 
    2   key_trabbl key_lim2 key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_top key_cfc key_c14b key_iomput key_mpp_mpi 
     2  key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_top key_cfc key_c14b key_iomput key_mpp_mpi 

  • trunk/NEMOGCM/fcm-make/inc/keys-orca2_lim_pisces.cfg

    r5930 r6140  
    11preprocess.prop{fpp.defs} = \ 
    2   key_trabbl key_lim2 key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_top key_pisces key_iomput key_mpp_mpi 
     2  key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_top key_pisces key_iomput key_mpp_mpi 

  • trunk/NEMOGCM/fcm-make/inc/keys-orca2_sas_lim.cfg

    r5930 r6140  
    11preprocess.prop{fpp.defs} = \ 
    2   key_trabbl key_lim2 key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi 
     2  key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi 
Note: See TracChangeset for help on using the changeset viewer.