Changeset 1802 for LMDZ5/trunk

Timestamp:

Jul 19, 2013, 4:03:57 PM (11 years ago)

Author:

yann meurdesoif

Message:

Add parallel compiling functionality through fcm
=> 2 new options for the makelmdz_fcm

-j n : enable parallel compiling on 8 tasks
-full : recreate dependency and recompile form scratch

YM

Location:

LMDZ5/trunk

Files:

• bld.cfg (modified) (3 diffs)
• build_gcm (modified) (2 diffs)
• makelmdz_fcm (modified) (4 diffs)

LMDZ5/trunk/bld.cfg

@@ -30 +30 @@
 src::ext_src %EXT_SRC
 
-bld::lib::dyn      %DYN
-bld::lib::phys     %PHYS
-bld::lib::grid      grid
-bld::lib::filtrez   filtrez
-bld::lib::bibio     bibio
-bld::lib::cosp      cosp
-bld::lib: ext_src   ext_src
-
+bld::lib            lmdz
 
 bld::outfile_ext::exe    %SUFF_NAME.e
-bld::target              lib%{DYN}.a lib%{PHYS}.a libgrid.a libfiltrez.a libbibio.a libcosp.a libext_src.a
+bld::target              liblmdz.a 
 bld::target              %EXEC%SUFF_NAME.e
-bld::exe_dep             %{DYN} %{PHYS} grid filtrez bibio cosp ext_src
+bld::exe_dep             
 
 
@@ -64 +57 @@
 
 
+# Example of how to set specific compiling options for a specific file
+# -> this can be including in the arch.opt file
 #bld::tool::fflags::phys::readaerosol         %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt -pi auto
-#bld::tool::fflags::phys::aeropt_2bands       %BASE_FFLAGS %PROD_FFLAGS  %INCDIR
-#bld::tool::fflags::phys::radiation_AR4       %BASE_FFLAGS %PROD_FFLAGS1 %INCDIR -C hopt -Wf,-O,extendreorder
-#bld::tool::fflags::phys::radiation_AR4_param %BASE_FFLAGS %PROD_FFLAGS1 %INCDIR -C hopt -f3
-#bld::tool::fflags::phys::fisrtilp            %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-#bld::tool::fflags::phys::cv30_routines       %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -Wf,-O,extendreorder
-#bld::tool::fflags::phys::cvltr               %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-#bld::tool::fflags::phys::clouds_gno          %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-#bld::tool::fflags::dyn::vlsplt_p             %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-#bld::tool::fflags::dyn::groupeun_p           %BASE_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
 
 
@@ -95 +81 @@
 bld::excl_dep        use::mod_prism_get_proto
 bld::excl_dep        use::mod_prism_put_proto
-bld::excl_dep        use::mkl_dfti
 
 # Don't generate interface files

LMDZ5/trunk/build_gcm

@@ -29 +29 @@
 fi
 
+job=1
 dirname="" #path to where the fcm command will be found
 if (( $# >= 1 )) ; then
@@ -39 +40 @@
   # add a trailing "/" to $dirname
   dirname=${dirname}"/"
+  shift;
 fi
 
 # run "fcm build" command
-${dirname}fcm build
+${dirname}fcm build $*
 
 # cleanup

LMDZ5/trunk/makelmdz_fcm

@@ -29 +29 @@
 LIBPREFIX=""
 cosp=false
+job=1
+full=''
 
 LMDGCM=`/bin/pwd`
@@ -79 +81 @@
 [-filtre NOMFILTRE]        : use filtre from libf/NOMFILTRE (default: filtrez)
 [-link LINKS]              : additional links with other libraries
+[-j n]                     : active parallel compiling on ntask
+[-full]                    : full recompiling 
 [-fcm_path path]           : path to the fcm tool (default: tools/fcm/bin)
 [-ext_src path]            : path to an additional set of routines to compile with the model
@@ -147 +151 @@
       "-ext_src")
           EXT_SRC=$2 ; shift ; shift ;;
+      "-j")
+          job=$2 ; shift ; shift ;;
+      "-full")
+          full="-full" ; shift ;;
 
       "-arch")
@@ -468 +476 @@
 
 rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
-./build_gcm ${fcm_path}
+./build_gcm ${fcm_path} -j $job $full
 
 rm -rf tmp_src