Ignore:
Timestamp:
2016-04-20T11:33:10+02:00 (5 years ago)
Author:
davestorkey
Message:

Changes from nemo_v3_6_STABLE_copy branch.
Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r6237 cf. r5781 of /branches/UKMO/nemo_v3_6_STABLE_copy/NEMOGCM@6486

Location:
branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC/arch-PW6_calypso.fcm

    r4865 r6487  
    1313# USER_INC    additional include files for the compiler,  e.g. -I<include dir>  
    1414# USER_LIB    additional libraries to pass to the linker, e.g. -l<library> 
     15# CC          C compiler used to compile conv for AGRIF 
     16# CFLAGS      compiler flags used with CC 
    1517 
    1618 
     
    2931%USER_INC            %NCDF_INC 
    3032%USER_LIB            %NCDF_LIB  
     33%CC                  xlc 
     34%CFLAGS              -O -qcpluscmt 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_debug.fcm

    r4865 r6487  
    1313# USER_INC    additional include files for the compiler,  e.g. -I<include dir>  
    1414# USER_LIB    additional libraries to pass to the linker, e.g. -l<library> 
     15# CC          C compiler used to compile conv for AGRIF 
     16# CFLAGS      compiler flags used with CC 
    1517 
    1618 
     
    2931%USER_INC            %NCDF_INC 
    3032%USER_LIB            %NCDF_LIB  
     33%CC                  xlc 
     34%CFLAGS              -O -qcpluscmt 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_tools.fcm

    r4865 r6487  
    1313# USER_INC    additional include files for the compiler,  e.g. -I<include dir>  
    1414# USER_LIB    additional libraries to pass to the linker, e.g. -l<library> 
     15# CC          C compiler used to compile conv for AGRIF 
     16# CFLAGS      compiler flags used with CC 
    1517 
    1618 
     
    2931%USER_INC            %NCDF_INC 
    3032%USER_LIB            %NCDF_LIB  
     33%CC                  xlc 
     34%CFLAGS              -O -qcpluscmt 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC/arch-gfortran_athena_xios.fcm

    r4865 r6487  
    2525# USER_INC    complete list of include files 
    2626# USER_LIB    complete list of libraries to pass to the linker 
     27# CC          C compiler used to compile conv for AGRIF 
     28# CFLAGS      compiler flags used with CC 
    2729# 
    2830# Note that: 
     
    5658%USER_INC            %XIOS_INC %NCDF_INC %HDF5_INC 
    5759%USER_LIB            %XIOS_LIB %NCDF_LIB %HDF5_LIB  -lnetcdff -lnetcdf -lstdc++ -lz -lcurl -lgpfs 
     60 
     61%CC                  cc 
     62%CFLAGS              -O0 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC/arch-ifort_athena.fcm

    r4865 r6487  
    1313# USER_INC additional include files for the compiler, e.g. -I<include dir> 
    1414# USER_LIB additional libraries to pass to the linker, e.g. -l<library> 
     15# CC          C compiler used to compile conv for AGRIF 
     16# CFLAGS      compiler flags used with CC 
    1517 
    1618 
     
    2931%USER_INC %NCDF_INC 
    3032%USER_LIB %NCDF_LIB 
     33%CC                  icc 
     34%CFLAGS              -O0 
    3135 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC/arch-ifort_athena_debug.fcm

    r4865 r6487  
    1313# USER_INC additional include files for the compiler, e.g. -I<include dir> 
    1414# USER_LIB additional libraries to pass to the linker, e.g. -l<library> 
     15# CC          C compiler used to compile conv for AGRIF 
     16# CFLAGS      compiler flags used with CC 
    1517 
    1618 
     
    2931%USER_INC %NCDF_INC 
    3032%USER_LIB %NCDF_LIB 
     33%CC                  icc 
     34%CFLAGS              -O0 
    3135 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC/arch-ifort_athena_tools.fcm

    r4865 r6487  
    1313# USER_INC additional include files for the compiler, e.g. -I<include dir> 
    1414# USER_LIB additional libraries to pass to the linker, e.g. -l<library> 
     15# CC          C compiler used to compile conv for AGRIF 
     16# CFLAGS      compiler flags used with CC 
    1517 
    1618 
     
    2931%USER_INC %NCDF_INC 
    3032%USER_LIB %NCDF_LIB 
     33%CC                  icc 
     34%CFLAGS              -O0 
    3135 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/ARCH/CMCC/arch-ifort_athena_xios.fcm

    r4997 r6487  
    2525# USER_INC    complete list of include files 
    2626# USER_LIB    complete list of libraries to pass to the linker 
     27# CC          C compiler used to compile conv for AGRIF 
     28# CFLAGS      compiler flags used with CC 
    2729# 
    2830# Note that: 
     
    5557%USER_INC            %XIOS_INC %NCDF_INC %HDF5_INC 
    5658%USER_LIB            %XIOS_LIB %NCDF_LIB %HDF5_LIB 
     59%CC                  icc 
     60%CFLAGS              -O0 
Note: See TracChangeset for help on using the changeset viewer.