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 4990 for trunk/NEMOGCM/TOOLS/COMPILE – NEMO

Ignore:
Timestamp:
2014-12-15T17:42:49+01:00 (9 years ago)
Author:
timgraham
Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

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/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

Location:
trunk/NEMOGCM/TOOLS/COMPILE
Files:
9 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh

    r2603 r4990  
    3333# 
    3434# 
    35 # Script to add a set off key when compiling a configuration. 
    36 # The list off key to be added has to be enclosed with " ".  
     35# Script to add a set of key when compiling a configuration. 
     36# The list of key to be added has to be enclosed with " ".  
    3737# A 'sed' is performed to modify the CONFIG_NAME/cpp.fcm file to     
    3838# add the new key(s).  

  • trunk/NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh

    r3294 r4990  
    3939# - Nothing set, use the previous in use  
    4040# 
    41 # We use TOOLS/CONFIG_DIR/cfg.txt to check if the onfiguration exists. 
     41# We use TOOLS/CONFIG_DIR/cfg.txt to check if the configuration exists. 
    4242# 
    4343# EXAMPLES 
    … …  
    7676   echo "Use makenemo -n MYCONFIG" 
    7777   echo "or  makenemo -h for help" 
    78    echo "Using defaut configuration : ${NEW_CONF}" 
     78   echo "Using default configuration : ${NEW_CONF}" 
    7979fi 
    8080if [ "$1" == cfg.txt ]; then 

  • trunk/NEMOGCM/TOOLS/COMPILE/Fclean_var.sh

    r3294 r4990  
    1111# 
    1212# ---------------------------- 
    13 # Clean environement variables 
     13# Clean environment variables 
    1414# ---------------------------- 
    1515# 
    … …  
    2626# 
    2727# 
    28 # Clean environement variables 
     28# Clean environment variables 
    2929# 
    3030# EXAMPLES 

  • trunk/NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh

    r3294 r4990  
    2626# 
    2727# 
    28 # When a refenrence configuration is set,  
     28# When a reference configuration is set,  
    2929# Copy NEMO sub-directories needed (OPA_SRC, TOP_SRC ...) 
    3030# 

  • trunk/NEMOGCM/TOOLS/COMPILE/Fdel_keys.sh

    r2584 r4990  
    3434# 
    3535# Add cpp keys when compiling a configuration, key list has to be enclosed with " ". 
    36 # We perform a 'sed' on the CONFIG_NAME/CPP.fcm file, contianing the list of keys.  
     36# We perform a 'sed' on the CONFIG_NAME/CPP.fcm file, containing the list of keys.  
    3737# 
    3838# EXAMPLES 

  • trunk/NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh

    r3680 r4990  
    3535# Make the WORK directory: 
    3636# 
    37 # - Create lin in NEW_CONF/WORK 
     37# - Create line in NEW_CONF/WORK 
    3838# - Use specified sub-directories previously 
    3939# - OPA has to be done first !!! 

  • trunk/NEMOGCM/TOOLS/COMPILE/bld.cfg

    r4865 r4990  
    5353bld::excl_dep        inc::mpe_logf.h 
    5454bld::excl_dep        use::mpi 
    55 bld::excl_dep        use::mod_prism_proto 
    56 bld::excl_dep        use::mod_prism_def_partition_proto 
    57 bld::excl_dep        use::mod_prism_get_comm 
    58 bld::excl_dep        use::mod_prism_get_proto 
    59 bld::excl_dep        use::mod_prism_put_proto 
    60 bld::excl_dep        use::mod_comprism_proto 
     55bld::excl_dep        use::mod_oasis 
    6156bld::excl_dep        use::mkl_dfti 
    6257# Don't generate interface files 

  • trunk/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg

    r4865 r4990  
    4747bld::excl_dep        inc::mpe_logf.h 
    4848bld::excl_dep        use::mpi 
    49 bld::excl_dep        use::mod_prism_proto 
    50 bld::excl_dep        use::mod_prism_def_partition_proto 
    51 bld::excl_dep        use::mod_prism_get_comm 
    52 bld::excl_dep        use::mod_prism_get_proto 
    53 bld::excl_dep        use::mod_prism_put_proto 
    54 bld::excl_dep        use::mod_comprism_proto 
     49bld::excl_dep        use::mod_oasis 
    5550bld::excl_dep        use::mkl_dfti 
    5651bld::excl_dep       use::nc4interface 

  • trunk/NEMOGCM/TOOLS/COMPILE/bldxag.cfg

    r4865 r4990  
    4949bld::excl_dep        inc::mpe_logf.h 
    5050bld::excl_dep        use::mpi 
    51 bld::excl_dep        use::mod_prism_proto 
    52 bld::excl_dep        use::mod_prism_def_partition_proto 
    53 bld::excl_dep        use::mod_prism_get_comm 
    54 bld::excl_dep        use::mod_prism_get_proto 
    55 bld::excl_dep        use::mod_prism_put_proto 
    56 bld::excl_dep        use::mod_comprism_proto 
     51bld::excl_dep        use::mod_oasis 
    5752bld::excl_dep        use::mkl_dfti 
    5853# Don't generate interface files 
Note: See TracChangeset for help on using the changeset viewer.