Changeset 2238 for LMDZ5/trunk/makelmdz

Timestamp:

Mar 20, 2015, 11:54:59 AM (10 years ago)

Author:

Ehouarn Millour

Message:

Update of "makelmdz" and "create_make_gcm" scripts so that only required directories are scanned when building the makefile.
EM

File:

• LMDZ5/trunk/makelmdz (modified) (12 diffs)

LMDZ5/trunk/makelmdz

@@ -84 +84 @@
 PARA_LD=""
 EXT_SRC=""
-
+#src_dirs: directories containing source files 
+src_dirs="grid bibio" 
 ########################################################################
 # lecture des options
@@ -106 +107 @@
           true        : (obsolete; for backward compatibility) use ORCHIDEE tag 1.9-1.9.6
 [-chimie INCA/false]       : with INCA chemistry model or without (default: false)
+[-cosp true/false]    : compile with/without cosp package (default: false)
+[-sisvat true/false]  : compile with/without sisvat package (default: false)
+[-rrtm true/false]    : compile with/without rrtm package (default: false)
 [-parallel none/mpi/omp/mpi_omp] : parallelism (default: none) : mpi, openmp or mixted mpi_openmp
 [-g GRI]                   : grid configuration in dyn3d/GRI_xy.h  (default: reg, inclues a zoom)
@@ -186 +190 @@
 
       "-ext_src")
-          EXT_SRC=$2 ; shift ; shift ;;
+          EXT_SRC=$2 ; src_dirs="$src_dirs $EXT_SRC" ; shift ; shift ;;
 
       "-arch")
@@ -283 +287 @@
 then
    #We'll use some physics
+   src_dirs="$src_dirs phy$physique"
    CPP_KEY="$CPP_KEY CPP_PHYS"
    if [[ "${physique:0:3}" == "lmd" ]]
@@ -316 +321 @@
       echo "You should use option \"-mem\"."
       exit 1
-  fi     
+  fi
 fi
 
@@ -413 +418 @@
    CPP_KEY="$CPP_KEY CPP_COSP"
    COSP_PATH="$LIBFGCM/cosp"
+   src_dirs="$src_dirs cosp"
 #   LIB="${LIB} -l${LIBPREFIX}cosp"
    opt_dep="$opt_dep cosp"
@@ -422 +428 @@
 then
    CPP_KEY="$CPP_KEY CPP_SISVAT"
+   src_dirs="$src_dirs phy${physique}/sisvat"
 fi
 
@@ -427 +434 @@
 then
    CPP_KEY="$CPP_KEY CPP_RRTM"
+   src_dirs="$src_dirs phy${physique}/rrtm"
 fi
 
@@ -489 +497 @@
 
 if (( $dimc == 3 )) ; then
+   src_dirs="$src_dirs $filtre dyn3d_common dyn3d${FLAG_PARA}"
    cd $LIBFGCM/grid
    \rm fxyprim.h
@@ -498 +507 @@
    INCLUDE="$INCLUDE "'-I$(LIBF)/dyn2d'
 elif (( $dimc == 1 )) ; then
+   src_dirs="$src_dirs dyn3d dyn3d_common filtrez"
    CPP_KEY="$CPP_KEY CPP_1D"
    filtre="L_DYN= DYN= FILTRE= L_FILTRE= DIRMAIN=phy$physique "
@@ -539 +549 @@
 cd $LMDGCM
 
-find libf -name '*.[Fh]' -print > tmp77
-find libf -name '*.[Fh]' -exec egrep -i " *use *ioipsl" {} \; -print > tmp90
-find libf -name '*.F90' -print >> tmp90
-
-if [[ ! ( -r makefile ) || ! ( -r liste_des_sources_f90 ) || ! ( -r liste_des_sources_f77 ) || ` diff tmp77 liste_des_sources_f77 | wc -w ` -ne 0 || ` diff tmp90 liste_des_sources_f90 | wc -w ` -ne 0 ]]
+find libf -name '*.[Fh]' -print | sort > tmp77
+#find libf -name '*.[Fh]' -exec egrep -i " *use *ioipsl" {} \; -print > tmp90
+find libf -name '*.F90' -print | sort > tmp90
+
+if [[ -r .makelmdz ]]
+then
+old_lmdz_configuration=$(cat .makelmdz )
+else
+old_lmdz_configuration=""
+fi
+lmdz_configuration="$src_dirs"
+if [[ "$lmdz_configuration" != "$old_lmdz_configuration" ]]
+then
+  configuration_change="true"
+else
+  configuration_change="false"
+fi
+
+if [[ $configuration_change == "true" || ! ( -r makefile ) || ! ( -r liste_des_sources_f90 ) || ! ( -r liste_des_sources_f77 ) || ` diff tmp77 liste_des_sources_f77 | wc -w ` -ne 0 || ` diff tmp90 liste_des_sources_f90 | wc -w ` -ne 0 ]]
 then
   echo "les fichiers suivants ont ete crees ou detruits"
@@ -551 +575 @@
   \cp -f tmp77 liste_des_sources_f77
   \cp -f tmp90 liste_des_sources_f90
-  echo "on recree le makefile"
-  ./create_make_gcm > tmp 
+  echo "Recreating the makefile"
+  echo "src_dirs: $src_dirs"
+  ./create_make_gcm $src_dirs > tmp 
   \mv -f tmp makefile
-  echo "Nouveau makefile cree"
-fi
+  echo "New makefile created"
+fi
+
+#Create a .makelmdz file containing main compilation option for later comparisons
+echo "$lmdz_configuration" > .makelmdz
 
 #################################################################