Changeset 1391 for trunk/LMDZ.COMMON/makelmdz

Timestamp:

Mar 6, 2015, 3:12:12 PM (10 years ago)

Author:

emillour

Message:

Common dynamical core:
Updates in the dynamics to keeup up with updates in LMDZ5
(up to LMDZ5 trunk rev 2200):

• compilation:
• create_make_gcm : added processing of .f & .f90 files (not just .F and .F90)
• makelmdz: add "mix" option for -io (ouptut with both IOIPSL and XIOS)
• makelmdz_fcm: add "mix" option for -io

• filtrez:
• acc.F and eigen.F : add "implicit none" and variable declarations

• bibio:
• handle_err_m.F90: replace "stop" with call to abort_gcm()
• i1mach.F, j4save.F: add "implicit none" and variable declarations
• xercnt.F, xermsg.F, xerprn.F, xersve.F, xgetua.F: add "implicit none" and variable declarations

• dyn3d_common:
• disvert.F90 : added comments on meaning of "pa" variable
• grid_atob.F : better control on level of default ouputs
• infotrac.F90: update Earth-specific stuff (nqo water tracers)
• interpre.F: correction on the size of input array w
• juldate.F, massbar.F, ppm3d.F, ran1.F: add "implicit none" and variable declarations
• sortvarc.F: code cleanup
• iniacademic.F90: cleanup and extra sanity check.

• dyn3d:
• abort_gcm.F: additions for XIOS
• conf_gcm.F90: transformed to free form from conf_gcm.F
• gcm.F: added test to check that iphysiq is a multiple of iperiod
• getparam.F90, guidz_mod.F: update from LMDZ5
• integrd.F: replace stop with call_abort()

• dyn3dpar:
• abort_gcm.F: minor cleanup
• gcm.F: added test to check that iphysiq is a multiple of iperiod
• getparam.F90, guide_p_mod.F90: update from LMDZ5
• integrd_p.F: abort with call_abort when there is negative surface pressure
• leapfrog_p.F: add INCA specific stuff to keep up with current LMDZ5
• conf_gcm.F90: transformed to free form from conf_gcm.F

EM

File:

• trunk/LMDZ.COMMON/makelmdz (modified) (5 diffs)

trunk/LMDZ.COMMON/makelmdz

@@ -118 +118 @@
 [-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)
-[-io IO]                   : Input/Output library (default: ioipsl)
+[-io ioipsl/mix/xios]                   : Input/Output library (default: ioipsl)
 [-include INCLUDES]        : extra include path to add
 [-cpp CPP_KEY]             : additional preprocessing definitions
@@ -209 +209 @@
 
 ###############################################################
-# lecture des chemins propres à l'architecture de la machine #
+# lecture des chemins propres \`a l'architecture de la machine #
 ###############################################################
 rm -f .void_file
@@ -424 +424 @@
    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
-elif [[ $io == xios ]]
+elif [[ $io == mix ]]
 then
    # For now, xios implies also using ioipsl
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
+   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
+   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
+elif [[ $io == xios ]]
+then
+   # For now, xios implies also using ioipsl
+   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
@@ -551 +557 @@
 cd $LMDGCM
 
-#cleanup for a full recompilation, if requested
+########################################################################
+# library directory name:
+########################################################################
+
+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'`
+echo "Path to library: "$nomlib
+
+########################################################################
+#  Cleanup for a full recompilation, if requested
+########################################################################
+
 if [[ $full == "full" ]]
 then
-# remove makefile and $libo/*
-  cd $LMDGCM
+# remove makefile and libraries
+  echo "-full option: recompiling from scratch"
   \rm -f makefile
-  \rm -rf $LIBOGCM/*
+  \rm -rf "${LIBOGCM}/${nomlib}"
 fi
 
@@ -650 +666 @@
   fi
 fi
-
-# library directory name:
-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'`
-echo $nomlib
 
 if [[ ! -d "${LIBOGCM}/${nomlib}" ]]