Changeset 9817 for branches/UKMO/dev_r5518_nemo2cice_prints/NEMOGCM/TOOLS/COMPILE

Timestamp:

2018-06-21T11:58:42+02:00 (6 years ago)

Author:

dancopsey

Message:

Merged in GO6 package branch up to revision 8356.

Location:

branches/UKMO/dev_r5518_nemo2cice_prints/NEMOGCM/TOOLS/COMPILE

Files:

• Fmake_config.sh (modified) (1 diff)
• Fprep_agrif.sh (modified) (2 diffs)
• bld.cfg (modified) (1 diff)
• bld_preproagr.cfg (modified) (1 diff)
• conv.cfg (modified) (2 diffs)
• tools.txt (modified) (1 diff)

branches/UKMO/dev_r5518_nemo2cice_prints/NEMOGCM/TOOLS/COMPILE/Fmake_config.sh

@@ -65 +65 @@
 [ -f ${2}/EXP00/iodef.xml ] &&  \cp -R  ${2}/EXP00/iodef.xml ${1}/EXP00/.
 [ -f ${2}/EXP00/field_def.xml ] &&  \cp -R  ${2}/EXP00/field_def.xml ${1}/EXP00/.
+[ -f ${2}/EXP00/file_def.xml ] &&  \cp -R  ${2}/EXP00/file_def.xml ${1}/EXP00/.
 [ -f ${2}/EXP00/domain_def.xml ] &&  \cp -R  ${2}/EXP00/domain_def.xml ${1}/EXP00/.
 [ -f ${2}/EXP00/xmlio_server.def ] &&  \cp -R  ${2}/EXP00/xmlio_server.def ${1}/EXP00/.

branches/UKMO/dev_r5518_nemo2cice_prints/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh

@@ -57 +57 @@
 #- AGRIF conv
 if [ "$AGRIFUSE" == 1 ]; then
+#-MPI for AGRIF
+if [ ! -f ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h ];then
+   echo '#if defined key_mpp_mpi' > ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
+   echo '#define AGRIF_MPI'      >> ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
+   echo '#endif'                 >> ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
+fi
 
 #- CONV
-#fcm build ${TOOLS_DIR}/conv.cfg || exit 1
-gmake -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
@@ -67 +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/UKMO/dev_r5518_nemo2cice_prints/NEMOGCM/TOOLS/COMPILE/bld.cfg

@@ -41 +41 @@
 bld::tool::fppflags::nemo      %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/OPAFILES/inc
 bld::tool::fppflags::ioipsl    %FPPFLAGS
-bld::tool::fppflags::agrif     %FPPFLAGS
+bld::tool::fppflags::agrif     %FPPFLAGS -include ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
 
 # Ignore the following dependencies

branches/UKMO/dev_r5518_nemo2cice_prints/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg

@@ -52 +52 @@
 bld::excl_dep       use::ioipsl
 bld::excl_dep       use::xios
+bld::excl_dep        use::agrif_grids
 bld::excl_dep       use::agrif_types
 bld::excl_dep       use::agrif_util

branches/UKMO/dev_r5518_nemo2cice_prints/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
 
 

branches/UKMO/dev_r5518_nemo2cice_prints/NEMOGCM/TOOLS/COMPILE/tools.txt

@@ -1 @@
-REBUILD 
+SIREN