Changeset 4368 for LMDZ6/branches/Ocean_skin/makelmdz

Timestamp:

Dec 6, 2022, 12:01:16 AM (2 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• makelmdz (modified) (6 diffs)

LMDZ6/branches/Ocean_skin/makelmdz

@@ -111 +111 @@
 [-prod / -dev / -debug]    : compilation mode production (default) / developement / debug
 [-c false/MPI1/MPI2]       : coupling with ocean model : MPI1/MPI2/false (default: false)
-[-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
+[-v false/orchideetrunk/orchidee2.1/orchidee2.0/orchidee1.9] : version of the vegetation model to include (default: false)
           false       : no vegetation model
-          orchidee2.1 : compile using ORCHIDEE 2.1 (or more recent version)
+          orchideetrunk : compile using ORCHIDEE trunk from revision 7757 or higher
+          orchidee2.1 : compile using ORCHIDEE 2.1 until 4.1 included or until revision 7757 on the trunk
           orchidee2.0 : compile using ORCHIDEE 2.0 (or more recent version)
           orchidee1.9 : compile using ORCHIDEE up to the version including OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
@@ -442 +443 @@
 
 #==============================================================================
-if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" ]
+if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" -o "$veget" = "orchideetrunk" ]
 then
 
@@ -455 +456 @@
       CPP_KEY="$CPP_KEY ORCHIDEE_NOUNSTRUCT"
    elif [[ "$veget" == "orchidee2.1" ]] ; then
+      CPP_KEY="$CPP_KEY ORCHIDEE_NOLIC"
       orch_libs="sechiba parameters stomate parallel orglob orchidee"
+   elif [[ "$veget" == "orchideetrunk" ]] ; then
+      orch_libs="orchidee"
    else
       orch_libs="sechiba parameters stomate parallel orglob"
@@ -645 +649 @@
 ########################################################################
 
-nomlib=`echo ${arch}_${physique}_${dim_full}_${grille}_${compil_mod}_parall${parallel}_${CPP_KEY}_${FLAG_PARA} | sed -e 's/ //g' -e 's/-//g ' | sed -e 's/CPP_//g'`
+nomlib=`echo ${arch}_${physique}_${rad}_${dim_full}_${grille}_${compil_mod}_parall${parallel}_${CPP_KEY}_${FLAG_PARA} | sed -e 's/ //g' -e 's/-//g ' | sed -e 's/CPP_//g'`
 echo "Path to library: "$nomlib
 
@@ -692 +696 @@
 echo suf_make $suf_make
 
+########################################################################
+# (re)Creation du makefile
+########################################################################
+
+echo "Controle de la necessite de recreer le makefile"
 \rm tmp77 tmp90
 for dir in $src_dirs ; do
-find libf/$dir -name '*.[Fh]' -print | sort >> tmp77
-find libf/$dir -name '*.F90' -print | sort >> tmp90
+   # On recupere la liste de tous les subroutine, use et include pour
+   # vérifier que les dépendense n'ont pas changé et reconstuire le
+   # makefile le cas échéant
+   # On enleve tout apres ONLy et on met un "uniq" pour que ca ne recrée pas
+   # le makefile si on se contente d'ajouter des lignes dans le ONLY
+   for str in subroutine "use " "include " ; do
+      grep -i "$str" libf/$dir/*.[Fh] | cut -d\( -f1 | sed -e 's/[Oo][Nn][Ll][Yy].*.$//' | uniq >> tmp77
+      grep -i "$str" libf/$dir/*.F90  | cut -d\( -f1 | sed -e 's/[Oo][Nn][Ll][Yy].*.$//' | uniq >> tmp90
+   done
 done
 
@@ -715 +731 @@
   \mv -f tmp $makefile
   echo "New makefile created"
-fi
+else
+  echo Pas besoin de recreer le makefile
+fi
+
 
 ln -sf $makefile makefile
-
-#Create a .makelmdz file containing main compilation option for later comparisons
 echo "$lmdz_configuration" > .makelmdz