Changeset 5596


Ignore:
Timestamp:
2015-07-14T11:36:15+02:00 (5 years ago)
Author:
timgraham
Message:

Changes to allow compilation of conv using fcm build. C compiler and flags are now set in the arch file instead of being hard coded in Fprep_agrif.sh
All arch files have been modifies with best guess at the correct C compiler and flags.

Location:
branches/2014/dev_r4765_CNRS_agrif/NEMOGCM
Files:
7 added
5 deleted
27 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/CMCC/arch-PW6_calypso.fcm

    r5581 r5596  
    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/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_debug.fcm

    r5581 r5596  
    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/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/CMCC/arch-PW6_calypso_tools.fcm

    r5581 r5596  
    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/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/CMCC/arch-gfortran_athena_xios.fcm

    r5581 r5596  
    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/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/CMCC/arch-ifort_athena.fcm

    r5581 r5596  
    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/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/CMCC/arch-ifort_athena_debug.fcm

    r5581 r5596  
    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/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/CMCC/arch-ifort_athena_tools.fcm

    r5581 r5596  
    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/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/CMCC/arch-ifort_athena_xios.fcm

    r5581 r5596  
    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 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/INGV/arch-IBM_EKMAN_INGV.fcm

    r5581 r5596  
    1515# USER_INC    additional include files for the compiler,  e.g. -I<include dir> 
    1616# USER_LIB    additional libraries to pass to the linker, e.g. -l<library> 
     17# CC          C compiler used to compile conv for AGRIF 
     18# CFLAGS      compiler flags used with CC 
    1719 
    1820%NCDF_INC            -I/srv/lib/netcdf-x/include 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5860#FCFLAGS             -g -traceback -r8 -O0 -xT -ip -vec-report0 
    5961#FFLAGS              -g -traceback -r8 -O0 -xT -ip -vec-report0 
     62 
     63%CC                  cc 
     64%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-PW7_C2A_XIO.fcm

    r5581 r5596  
    1717# USER_INC    complete list of include files 
    1818# USER_LIB    complete list of libraries to pass to the linker 
     19# CC          C compiler used to compile conv for AGRIF 
     20# CFLAGS      compiler flags used with CC 
    1921# 
    2022# Note that: 
     
    4850%USER_INC            %XIOS_INC %NCDF_INC 
    4951%USER_LIB            %XIOS_LIB %NCDF_LIB %XLF90_LIB 
     52 
     53%CC                  xlc 
     54%CFLAGS              -O -qcpluscmt 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-PW7_METO.fcm

    r5595 r5596  
    1515# USER_INC    additional include files for the compiler,  e.g. -I<include dir> 
    1616# USER_LIB    additional libraries to pass to the linker, e.g. -l<library> 
     17# CC          C compiler used to compile conv for AGRIF 
     18# CFLAGS      compiler flags used with CC 
    1719 
    1820 
     
    2426%FC                  mpxlf90_r 
    2527%FCFLAGS             -qrealsize=8 -qextname -qsuffix=f=f90 -qarch=pwr7 -qtune=pwr7 -g -O2 -qstrict -qinitauto=7FBFFFFF 
    26 %FFLAGS              -qrealsize=8 -qextname -qsuffix=f=f90 -qarch=pwr7 -qtune=pwr7 -g -O2 -qstrict -qinitauto=7FBFFFFF 
     28%FFLAGS             -qrealsize=8 -qextname -qsuffix=f=f90 -qarch=pwr7 -qtune=pwr7 -g -O2 -qstrict -qinitauto=7FBFFFFF 
    2729%LD                  mpCC_r 
    2830%LDFLAGS             -lxlf90 -L/projects/um1/lib -lsig -O2 -L MASS 
     
    3335%USER_INC            %NCDF_INC %XIOS_INC 
    3436%USER_LIB            %NCDF_LIB %XIOS_LIB 
     37%CC                  xlc 
     38%CFLAGS              -O -qcpluscmt 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-PW7_MONSOON.fcm

    r5581 r5596  
    1515# USER_INC    additional include files for the compiler,  e.g. -I<include dir> 
    1616# USER_LIB    additional libraries to pass to the linker, e.g. -l<library> 
     17# CC          C compiler used to compile conv for AGRIF 
     18# CFLAGS      compiler flags used with CC 
    1719 
    1820%NCDF_INC            -I/home/dcalve/netcdf/4.1.3_seq/include 
     
    3234%USER_INC            %NCDF_INC %XIOS_INC 
    3335%USER_LIB            %NCDF_LIB %XIOS_LIB 
     36 
     37%CC                  xlc 
     38%CFLAGS              -O -qcpluscmt 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-X64_ADA.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5456%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    5557%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     58 
     59%CC                  icc 
     60%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-X64_ADA_O0.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5355%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    5456%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     57 
     58%CC                  icc 
     59%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-X64_CURIE.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5860%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    5961%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     62 
     63%CC                  cc 
     64%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-X64_MOBILIS.fcm

    r5581 r5596  
    2929# USER_INC    complete list of include files 
    3030# USER_LIB    complete list of libraries to pass to the linker 
     31# CC          C compiler used to compile conv for AGRIF 
     32# CFLAGS      compiler flags used with CC 
    3133# 
    3234# Note that: 
     
    5860%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    5961%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     62 
     63%CC                  cc 
     64%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-X64_VAYU.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5355%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    5456%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     57 
     58%CC                  cc 
     59%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-X64_YELLOWSTONE.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5355%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    5456%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     57 
     58%CC                  cc 
     59%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-XC40_METO.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5153%USER_INC            %XIOS_INC 
    5254%USER_LIB            %XIOS_LIB 
     55 
     56%CC                  cc 
     57%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-XC_ARCHER.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5759#USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    5860#USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     61 
     62%CC                  cc 
     63%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-XC_ARCHER_INTEL.fcm

    r5581 r5596  
    2424# USER_INC    complete list of include files 
    2525# USER_LIB    complete list of libraries to pass to the linker 
     26# CC          C compiler used to compile conv for AGRIF 
     27# CFLAGS      compiler flags used with CC 
    2628# 
    2729# Note that: 
     
    5557#USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    5658#USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     59 
     60%CC                  cc 
     61%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-macport_osx.fcm

    r5581 r5596  
    3333# USER_INC    complete list of include files 
    3434# USER_LIB    complete list of libraries to pass to the linker 
     35# CC          C compiler used to compile conv for AGRIF 
     36# CFLAGS      compiler flags used with CC 
    3537# 
    3638# Note that: 
     
    6264%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC 
    6365%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB 
     66 
     67%CC                  cc 
     68%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm

    r5581 r5596  
    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# debug: -g  -check bounds -check uninit -check pointers -traceback 
    1618 
     
    3133%USER_INC            -I$XIOS_INC %NCDF_INC 
    3234%USER_LIB            -L$XIOS_LIB -lxios %NCDF_LIB -lstdc++ 
     35 
     36%CC                  cc 
     37%CFLAGS              -O0 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/EXTERNAL/AGRIF/LIB/Makefile

    r4779 r5596  
    1919   @echo 
    2020 
    21 main.c: convert.y convert.lex 
    22    @echo =================================================== 
    23    @echo   Rebuilding main.c ... 
    24    @echo =================================================== 
    25    $(MAKE) -f Makefile.lex main.c 
     21#main.c: convert.y convert.lex 
     22#  @echo =================================================== 
     23#  @echo   Rebuilding main.c ... 
     24#  @echo =================================================== 
     25#  $(MAKE) -f Makefile.lex main.c 
    2626 
    27 fortran.c: fortran.y fortran.lex 
    28    @echo =================================================== 
    29    @echo   Rebuilding fortran.c ... 
    30    @echo =================================================== 
    31    $(MAKE) -f Makefile.lex fortran.c 
     27#fortran.c: fortran.y fortran.lex 
     28#  @echo =================================================== 
     29#  @echo   Rebuilding fortran.c ... 
     30#  @echo =================================================== 
     31#  $(MAKE) -f Makefile.lex fortran.c 
    3232 
    3333conv: $(OBJS) 
     
    6262 
    6363clean: 
    64    $(MAKE) -f Makefile.lex clean 
     64#  $(MAKE) -f Makefile.lex clean 
    6565   $(RM) *.o conv 
    6666    
    67 clean-all: clean 
    68    $(MAKE) -f Makefile.lex clean-all 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh

    r5587 r5596  
    6565 
    6666 #- CONV 
    67  #fcm build ${TOOLS_DIR}/conv.cfg || exit 1 
    68 C_COMPILER=${CC-cc} 
    69 gmake CC=${C_COMPILER} -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB 
     67fcm build ${COMPIL_DIR}/conv.cfg || exit 1 
     68#C_COMPILER=${CC-cc} 
     69#gmake CC=${C_COMPILER} -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB 
    7070 
    7171#- AGRIF sources 
     
    7474[ ! -d $2/$1/OPAFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/OPAFILES/AGRIF_MODELFILES 
    7575cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_opa.in  $2/$1/OPAFILES/ 
    76 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/OPAFILES/ 
     76#cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/OPAFILES/ 
     77cp -f -r $2/$1/AGRIFLIB/bin/conv  $2/$1/OPAFILES/ 
    7778 
    7879fi 
  • branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE/conv.cfg

    r3294 r5596  
    88# Build information 
    99# ------------------------------------------------------------------------------ 
    10 inc $COMPIL_DIR/arch.fcm 
     10inc $COMPIL_DIR/arch_nemo.fcm 
    1111 
     12bld::tool::cc        %CC 
     13bld::tool::cflags    %CFLAGS 
    1214bld::tool::make      %MK 
    1315 
     
    1921dir::root            $NEMO_TDIR/$NEW_CONF/AGRIFLIB 
    2022 
    21 bld::tool::cflags::convsrc  -O0   
    22 bld::tool::ld::convsrc   cc 
    23 bld::tool::ldflags::convsrc -O  ../obj/fortran.o ../obj/fortran.o  
    24 bld::pp 1 
     23#bld::tool::cflags::convsrc  -O0   
     24#bld::tool::ld::convsrc   cc 
     25#bld::tool::ldflags::convsrc -O  ../obj/fortran.o ../obj/fortran.o  
     26#bld::pp 1 
    2527 
    2628 
Note: See TracChangeset for help on using the changeset viewer.