Changeset 1999 for LMDZ5/branches/testing/makelmdz

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/makelmdz

@@ -26 +26 @@
 cosp=false
 sisvat=false
+rrtm=false
 
 # guess a default 'arch'
@@ -83 +84 @@
 
 CPP_KEY="" 
-INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. '
+INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/dyn3d_common -I$(LIBF)/filtrez -I. '
 LIB=""
 adjnt=""
@@ -177 +178 @@
           sisvat="$2" ; shift ; shift ;;
       
+      "-rrtm")
+          rrtm="$2" ; shift ; shift ;;
+      
       "-mem")
           paramem="mem" ; shift ;;
@@ -416 +420 @@
 fi
 
+if [[ "$rrtm" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_RRTM"
+fi
+
 
 INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
@@ -542 +551 @@
 find libf -name '*.[Fh]' -print > tmp77
 find libf -name '*.[Fh]' -exec egrep -i " *use *ioipsl" {} \; -print > tmp90
-find libf -name '*.[Fh90]' -print >> tmp90
+find libf -name '*.F90' -print >> tmp90
 
 if [[ ! ( -r makefile ) || ! ( -r liste_des_sources_f90 ) || ! ( -r liste_des_sources_f77 ) || ` diff tmp77 liste_des_sources_f77 | wc -w ` -ne 0 || ` diff tmp90 liste_des_sources_f90 | wc -w ` -ne 0 ]]