Changeset 5596 for branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS

Timestamp:

2015-07-14T11:36:15+02:00 (9 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/TOOLS/COMPILE

Files:

• Fprep_agrif.sh (modified) (2 diffs)
• conv.cfg (modified) (2 diffs)

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh

@@ -65 +65 @@
 
  #- CONV
- #fcm build ${TOOLS_DIR}/conv.cfg || exit 1
-C_COMPILER=${CC-cc}
-gmake CC=${C_COMPILER} -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB
+fcm build ${COMPIL_DIR}/conv.cfg || exit 1
+#C_COMPILER=${CC-cc}
+#gmake CC=${C_COMPILER} -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB
 
 #- AGRIF sources
@@ -74 +74 @@
 [ ! -d $2/$1/OPAFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/OPAFILES/AGRIF_MODELFILES
 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_opa.in  $2/$1/OPAFILES/
-cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/OPAFILES/
+#cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/OPAFILES/
+cp -f -r $2/$1/AGRIFLIB/bin/conv  $2/$1/OPAFILES/
 
 fi

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE/conv.cfg

@@ -8 +8 @@
 # Build information
 # ------------------------------------------------------------------------------
-inc $COMPIL_DIR/arch.fcm
+inc $COMPIL_DIR/arch_nemo.fcm
 
+bld::tool::cc        %CC
+bld::tool::cflags    %CFLAGS
 bld::tool::make      %MK
 
@@ -19 +21 @@
 dir::root            $NEMO_TDIR/$NEW_CONF/AGRIFLIB
 
-bld::tool::cflags::convsrc  -O0  
-bld::tool::ld::convsrc   cc
-bld::tool::ldflags::convsrc -O  ../obj/fortran.o ../obj/fortran.o 
-bld::pp 1
+#bld::tool::cflags::convsrc  -O0  
+#bld::tool::ld::convsrc   cc
+#bld::tool::ldflags::convsrc -O  ../obj/fortran.o ../obj/fortran.o 
+#bld::pp 1