Changeset 1107 for trunk/LMDZ.COMMON/makelmdz

Timestamp:

Nov 19, 2013, 12:52:22 PM (12 years ago)

Author:

emillour

Message:

Common dynamics: Updates and modifications to enable running Mars physics with

LMDZ.COMMON dynamics:

• For compilation: adapted makelmdz, create_make_gcm and makelmdz_fcm, bld.cfg to compile aeronomy routines in "aerono$physique" if it exists, and added "-P -traditional" preprocessing flags in "arch-linux-ifort*"
• Added function "cbrt.F" (cubic root) in 'bibio'
• Adapted the reading/writing of dynamics (re)start.nc files for Mars. The main issue is that different information (on time, reference and current) is stored and used differently, hence a few if (planet_type =="mars") here and there. Moreover in the martian case there is the possibility to store fields over multiple times. Some Mars-specific variables (ecritphy,ecritstart,timestart) added in control_mod.F and (hour_ini) in temps.h

EM

File:

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

trunk/LMDZ.COMMON/makelmdz

@@ -28 +28 @@
 scatterers=""
 dyn=""
+full=''
 
 # guess a default 'arch'
@@ -135 +136 @@
 [-filtre NOMFILTRE]        : use filtre from libf/NOMFILTRE (default: filtrez)
 [-link LINKS]              : additional links with other libraries
-[-fcm_path path]           : path to the fcm tool (default: tools/fcm/bin)
+[-full]                    : full (re-)compilation (from scratch)
 [-ext_src path]            : path to an additional set of routines to compile with the model
  -arch arch                : target architecture 
@@ -203 +204 @@
           LIB="$LIB $2" ; shift ; shift ;;
 
-      "-fcm_path")
-          fcm_path=$2 ; shift ; shift ;;
+      "-full")
+          full="full" ; shift ;;
 
       "-ext_src")
@@ -327 +328 @@
 fi
 #########
+
+# for Mars (but could be used by others as well), there is also "aeronomars"
+if [[ -d ${LIBFGCM}/aerono${physique} ]]
+then
+   INCLUDE="$INCLUDE -I${LIBFGCM}/aerono${physique}"
+   LIB="$LIB -l${LIBPREFIX}aerono$physique"
+   opt_dep="$opt_dep aerono$physique"
+   laeronomars="-l${LIBPREFIX}aeronomars"
+fi
+
 
 if [[ "$chimie" == "INCA" ]]
@@ -581 +592 @@
 cd $LMDGCM
 
+#cleanup for a full recompilation, if requested
+if [[ $full == "full" ]]
+then
+# remove makefile and $libo/*
+  cd $LMDGCM
+  \rm -f makefile
+  \rm -rf $LIBOGCM/*
+fi
 
 ########################################################################
@@ -743 +762 @@
 L_ADJNT=$adjnt \
 L_COSP="$lcosp" \
+L_AERONOMARS="$laeronomars" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \
@@ -774 +794 @@
 L_ADJNT="$adjnt" \
 L_COSP="$lcosp" \
+L_AERONOMARS="$laeronomars" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \