Changeset 6050

Timestamp:

Jan 23, 2026, 8:25:22 AM (40 hours ago)

Author:

fhourdin

Message:

Corrections et parallelisation makelmdz

File:

• LMDZ6/trunk/makelmdz (modified) (5 diffs)

LMDZ6/trunk/makelmdz

@@ -98 +98 @@
 #src_dirs: directories containing source files 
 src_dirs="grid misc" 
+make_parallel=
 ########################################################################
 # lecture des options
@@ -137 +138 @@
 [-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)
@@ -221 +223 @@
       "-ext_src")
           EXT_SRC=$2 ; src_dirs="$src_dirs $EXT_SRC" ; shift ; shift ;;
+
+      "-j")
+          make_parallel=-j$2 ; shift ; shift ;;
 
       "-full")
@@ -740 +745 @@
 source_code=${code}.F
 dirmain=dyn${dimc}d${FLAG_PARA}
-if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]]
-then
-  source_code=${code}.F90
-elif [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.f90 ]]
-then
-  source_code=${code}.f90
-elif [[ -r $LMDGCM/libf/phy$physique/${code}.F90 ]] ; then
-  dirmain=phy$physique
-  source_code=${code}.F90
-elif [[ -r $LMDGCM/libf/dynphy_lonlat/phy$phys_root/${code}.F90 ]] ; then
-  dirmain="dynphy_lonlat/phy${phys_root}"
-  source_code=${code}.F90
-elif [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F90 ]] ; then
-  dirmain=phy$physique/dyn1d
-  source_code=${code}.F90
-fi
+
+for suf_ in F90 f90 ; do
+    for dir_ in dyn${dimc}d${FLAG_PARA} phy$physique libf/dynphy_lonlat/phy$phys_root phy$physique/dyn1d ; do
+       if [[ -r $LMDGCM/libf/$dir_/${code}.$suf_ ]] ; then
+            source_code=${code}.$suf_
+            dirmain=$dir_
+       fi
+    done
+done
+        
+# Retrirer ces lignes à la prochaine commissions
+# Elles sont remplacées par la double boucle au dessus
+#if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]]
+#then
+#  source_code=${code}.F90
+#elif [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.f90 ]]
+#then
+#  source_code=${code}.f90
+#elif [[ -r $LMDGCM/libf/phy$physique/${code}.f90 ]] ; then
+#  dirmain=phy$physique
+#  source_code=${code}.f90
+#elif [[ -r $LMDGCM/libf/dynphy_lonlat/phy$phys_root/${code}.F90 ]] ; then
+#  dirmain="dynphy_lonlat/phy${phys_root}"
+#  source_code=${code}.F90
+#elif [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F90 ]] ; then
+#  dirmain=phy$physique/dyn1d
+#  source_code=${code}.F90
+#elif [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.f90 ]] ; then
+#  dirmain=phy$physique/dyn1d
+#  source_code=${code}.f90
+#fi
 
 if [[ ! -d "${LIBOGCM}/${nomlib}" ]]
@@ -799 +819 @@
 #################################################################
 set -v
-$makecommand RANLIB=$ranlib -f $LMDGCM/makefile \
+$makecommand $make_parallel RANLIB=$ranlib -f $LMDGCM/makefile \
 OPTION_DEP="$opt_dep" OPTION_LINK="$LIB ${PARA_LD}" \
 OPTIM90="${COMPIL_FFLAGS} ${PARA_FFLAGS}" \