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 7646 for trunk/NEMOGCM/ARCH/arch-XC40_METO.fcm – NEMO

Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (7 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/ARCH/arch-XC40_METO.fcm

    r5757 r7646  
    3131#  - fcm variables are starting with a % (and not a $) 
    3232# 
    33 %NCDF_HOME           /opt/cray/netcdf-hdf5parallel/4.3.2/CRAY/83 
    34 %HDF5_HOME           /opt/cray/hdf5-parallel/1.8.13/CRAY/83 
    35 %XIOS_HOME           /projects/ocean/nemo/xios/xios_1.0_r629_20150625/XIOS 
     33# This arch file depends on loading XIOS-PrgEnv/2.0/24708 
     34 
     35%NCDF_HOME           $NETCDF_DIR 
     36%HDF5_HOME           $HDF5_DIR 
     37%XIOS_HOME           $xios_path 
     38%OASIS_HOME          $prism_path 
    3639 
    3740%NCDF_INC            -I%NCDF_HOME/include -I%HDF5_HOME/include 
    3841%NCDF_LIB            -L%HDF5_HOME/lib -L%NCDF_HOME/lib -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lz 
    39 %XIOS_INC            -I%XIOS_HOME/inc  
     42 
     43%XIOS_INC            -I%XIOS_HOME/inc 
    4044%XIOS_LIB            -L%XIOS_HOME/lib -lxios 
     45 
     46%OASIS_INC           -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 
     47%OASIS_LIBDIR        -L%OASIS_HOME/lib 
     48%OASIS_LIB           -lpsmile.MPI1 -lmct -lmpeu -lscrip 
    4149 
    4250%CPP                 cpp 
    4351%FC                  ftn 
    44 %FCFLAGS             -emf -s real64 -s integer32  -O2 -hflex_mp=intolerant -Rb 
    45 %FFLAGS              -emf -s real64 -s integer32  -O0 -hflex_mp=strict -Rb 
     52 
     53%FCFLAGS             -em -s real64 -s integer32  -O2 -hflex_mp=intolerant -e0 -ez 
     54%FFLAGS              -em -s real64 -s integer32  -O0 -hflex_mp=strict -e0 -ez -Rb 
    4655%LD                  ftn 
    4756%FPPFLAGS            -P -E -traditional-cpp 
    48 %LDFLAGS             -hbyteswapio  
    49 %AR                  ar  
     57%LDFLAGS             -hbyteswapio 
     58%AR                  ar 
    5059%ARFLAGS             -r 
    5160%MK                  gmake 
    5261 
    53 %USER_INC            %XIOS_INC 
    54 %USER_LIB            %XIOS_LIB 
     62%USER_INC            %NCDF_INC %XIOS_INC 
     63%USER_LIB            %NCDF_LIB %XIOS_LIB  
    5564 
    5665%CC                  cc 
Note: See TracChangeset for help on using the changeset viewer.