Changeset 5461

Timestamp:

Dec 31, 2024, 12:29:57 PM (3 days ago)

Author:

fhourdin

Message:

Quality control improvements

Location:

BOL/script_install

Files:

• check_version.sh (modified) (7 diffs)
• creation_modipsl.sh (modified) (5 diffs)
• verif_commit.sh (modified) (4 diffs)

BOL/script_install/check_version.sh

@@ -105 +105 @@
 fi
 
+if [ -d $MODEL ] ; then
+   mv $MODEL ${MODEL}_$$
+fi
+
 echo version $version $branche $datelmdz
 RESU_D=~/WWW/RESUBENCH/$branche/$compilo
@@ -127 +131 @@
    cd $tmpdir
    if [ "$rel_svn" = "" ] ; then opt_svn="" ; else opt_svn="-r $rel_svn" ; fi
-   \rm -f install_lmdz.sh ; $get/pub/install_lmdz.sh ; chmod +x install_lmdz.sh
+#   \rm -f install_lmdz.sh ; $get/pub/install_lmdz.sh ; chmod +x install_lmdz.sh
+# Le temps de confirmer la bascule
+   \rm -f install_lmdz.sh ; $get/pub/install_lmdz_old.sh ; \mv install_lmdz_old.sh install_lmdz.sh ; chmod +x install_lmdz.sh
    # On install sans les bench pour que les benchs soient faits à la main
    # ./install_lmdz.sh -v $version $opt_svn -d $resolution -SCM -parallel $parallel -veget CMIP6
@@ -168 +174 @@
 cd $BENCH ; $get/pub/3DBenchs/BENCHCMIP6.tar.gz . ;  tar xvf BENCHCMIP6.tar.gz 
 sed -i'' -e "s:VEGET=n:VEGET=y:" config.def
-./compilegcm_fcm.sh ; ./bench.sh > out.bench 2>&1
+./compilegcm_fcm.sh  -v orchidee2.0 ; ./bench.sh > out.bench 2>&1
 
 
@@ -243 +249 @@
 
    cd $LMDZdir/$BENCH
-   if [ -f compilegcm.sh -a $check_compile = 1 ] ; then
+   if [ -f compilegcm_fcm.sh -a $check_compile = 1 ] ; then
       \rm -f gcm.e
-      ./compilegcm.sh -debug
+      ./compilegcm_fcm.sh -debug
       mkdir SIMD
       cd SIMD
@@ -333 +339 @@
       pwd
       $get/Distrib/initialisation.sh
-      sed -e 's/grid_resolution=48x36x39/grid_resolution='$resolution'/' initialisation.sh > ini.sh
-      chmod +x ini.sh ; ./ini.sh
+      sed -e 's/grid_resolution=48x36x39/grid_resolution='$resolution'/' \
+          -e 's/makelmdz/makelmdz_fcm -arch $arch/' initialisation.sh > ini_fcm.sh
+      chmod +x ini_fcm.sh ; ./ini_fcm.sh
       if [ -f limit.nc ] ; then
          var=Tsoil01srf01
@@ -384 +391 @@
 
 ccc=$converge$convergeNP$convergeD$converge1D$convergeI
-if [ "$ccc" = "SNDUI" ] ; then ccc="OK " ;  fi
+if [ "$ccc" = "SNDUI" ] ; then ccc="OK " 
+        elif [ "$ccc" = "SNDUx" ] ; then
+                ccc="OKx"
+fi
 
 
@@ -441 +451 @@
   \rm -rf $tmpdir/LMDZ$version
 fi
-
+grep -q 'OK     SNDUx   OK2     OK' tmp.resu
+RET=$?
+if [ ${RET} -eq 0 ] ; then
+  echo "Quality control checks out for version $version"
+  echo "We cleanup $tmpdir/LMDZ$version"
+  echo "\rm -rf $tmpdir/LMDZ$version"
+  \rm -rf $tmpdir/LMDZ$version
+fi

BOL/script_install/creation_modipsl.sh

@@ -1 +1 @@
 #!/bin/bash
 
-#set -vx
+set -vx
 unset LANG
 
@@ -22 +22 @@
 latest="20231102"
 latest="20231215"
+latest="20240502"
+latest="20240920"
 #latest=20210512 # Pour imposer de tester la convergence avec une version passee
 
@@ -119 +121 @@
 if [ "$latest" != "" ] ; then
    cd /home/users/lmdz/WWW/RESUBENCH/$branche/gfortran
+   echo coucou > toto
    \rm -f latest
    ln -s `pwd`/$latest latest
@@ -142 +145 @@
 vorig=v18 # 2023/03/09 modification ORCHIDEE pour compatibilité IOIPSL: on rajoute 360_day comme attribut
 vorig=v19 # 2023/03/10 IOIPSL updated to version 2.2.5
+vorig=v20 # 2024/07/05 Changed address of ORCHIDEE svn depot
 
 modipsltar=modipsl.$vorig.tar
@@ -214 +218 @@
    cat tmp.resu >> LISMOI.$branche
    \cp -f LISMOI.trunk ../pub/src_archives/Readme
+   # essai nouvelle version install
+   ./check_version-ablf.sh -justcheck $version >| WORK/check_ablf.out.$version 2>&1
 ###
 ### clean up of /tmp/lmdz if everything went smoothly

BOL/script_install/verif_commit.sh

@@ -11 +11 @@
 TMP_OUT=/u/lmdz/WWW/Distrib/OUT
 TMP_D=/tmp/lmdz/test_rev_${REV}_$$ ; mkdir -p $TMP_D
+ncdfdir=/u/lmdz/Netcdf/lmdz-cq_20230902
 
-resolution=48x36x39 
+resolution=48x36x39
 physiq=NPv6.0.14splith
 # Changed on 15/03/2023 r4473
@@ -22 +23 @@
 chmod +x install_lmdz.sh
 #./install_lmdz.sh -SCM -unstable -debug -d $resolution -r $REV -physiq $physiq > ${TMP_OUT}/post-commit-lmdz-cq-${REV}_$$ 2>&1
-./install_lmdz.sh -SCM -unstable -debug -d $resolution -r $REV -netcdf /u/lmdz/Netcdf/lmdz-cq_gcc_8.3.0/ -rad oldrad -parallel mpi_omp  -physiq $physiq \
+#./install_lmdz.sh -SCM -unstable -debug -d $resolution -r $REV -netcdf /u/lmdz/Netcdf/lmdz-cq_9.4.0_ubunutu20.04/ -rad oldrad -parallel mpi_omp  -physiq $physiq \
+./install_lmdz.sh -SCM -unstable -debug -d $resolution -r $REV -netcdf $ncdfdir -rad oldrad -parallel mpi_omp  -benchphysiq $physiq \
+                  -arch local-gfortran9-parallel -arch_dir /u/lmdz/WWW/Distrib/arch.local \
                    > ${TMP_OUT}/post-commit-lmdz-cq-${REV}_$$ 2>&1
 #
@@ -40 +43 @@
 done
 # checking isotope compilation
+if [[ -v LD_LIBRARY_PATH ]]; then
+    echo "export LD_LIBRARY_PATH=$ncdfdir/lib:$LD_LIBRARY_PATH" >> icosalmdz.env
+else
+    echo "export LD_LIBRARY_PATH=$ncdfdir/lib" >> icosalmdz.env
+fi
+export PATH=$ncdfdir/bin:$PATH
+
 cd $TMP_D
 cd LMDZ*${REV}*/modipsl/modeles/LMDZ/
@@ -50 +60 @@
   echo "Cleaning up /tmp/lmdz/test_rev_${REV}_$$" >> ${TMP_OUT}/post-commit-lmdz-cq-${REV}_$$
   \rm -rf /tmp/lmdz/test_rev_${REV}_$$
+else
+  echo "There is a problem. QC is run in this directory /tmp/lmdz/test_rev_${REV}_$$ on lmdz-cq"
 fi
 #