Changeset 792 for LMDZ4/trunk/makegcm

Timestamp:

Jun 22, 2007, 2:46:23 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Modifications suite a la transformation des fichiers include pour
qu'ils soient compatibles a la fois au format fixe et au format libre
Un bon nombre de fichier *.inc du coup disparaissent
LF

File:

• LMDZ4/trunk/makegcm (modified) (3 diffs)

LMDZ4/trunk/makegcm

@@ -36 +36 @@
 #set LMDGCM=/workdir/p86cozic/INCA_dev/LMDZ4
 #setenv LIBOGCM $LMDGCM/libo
+set INCALIB=../INCA3/config/lib
 #set LMDGCM="`pwd`"
-set INCALIB=../INCA3/config/lib
 #setenv LIBOGCM $LMDGCM/libo
 #
-#setenv IOIPSLDIR /u/fairhead/modipsl_ioipsl_3/lib
-#setenv MODIPSLDIR /u/fairhead/modipsl_ioipsl_3/lib
+#setenv IOIPSLDIR /u/fairhead/modipsl_ioipsl_3/lib_i4r4_32bits
+#setenv MODIPSLDIR /u/fairhead/modipsl_ioipsl_3/lib_i4r4_32bits
 #setenv NCDFINC /distrib/local/netcdf/pgi_32bits/include
 #setenv NCDFLIB /distrib/local/netcdf/pgi_32bits/lib/
@@ -764 +764 @@
 # On adapte d'abord certains include à F90
 ##########################################
-#sed -e 's/^c/\!/' $libf/grid/dimensions.h >! $libf/grid/dimensions90.tmp
-#if ( ! -f $libf/grid/dimensions90.h || `diff $libf/grid/dimensions90.tmp $libf/grid/dimensions90.h | wc -w` ) then
-#      \mv $libf/grid/dimensions90.tmp $libf/grid/dimensions90.h
-#endif
-awk 'BEGIN {} { sub ("^c","\!") ; if ($0 ~ /^     s/) {if (NR > 1) print p0," &"; sub ("     s","     \\&")} else { if (NR > 1) print p0  } p0=$0 } END { print p0}' $libf/dyn3d${FLAG_PARA}/paramet.h >! $libf/dyn3d${FLAG_PARA}/paramet90.tmp
-if ( ! -f $libf/dyn3d${FLAG_PARA}/paramet90.h || `diff $libf/dyn3d${FLAG_PARA}/paramet90.tmp $libf/dyn3d${FLAG_PARA}/paramet90.h | wc -w` ) then
-      \mv $libf/dyn3d${FLAG_PARA}/paramet90.tmp $libf/dyn3d${FLAG_PARA}/paramet90.h
-endif
-awk 'BEGIN {} { sub ("^c","\!") ; if ($0 ~ /^     \./) {if (NR > 1) print p0," &"; sub ("     \.","     \\&")} else { if (NR > 1) print p0  } p0=$0 } END { print p0}' $libf/dyn3d${FLAG_PARA}/control.h >! $libf/dyn3d${FLAG_PARA}/control.tmp
-if ( ! -f $libf/dyn3d${FLAG_PARA}/control.inc  || `diff $libf/dyn3d${FLAG_PARA}/control.tmp $libf/dyn3d${FLAG_PARA}/control.inc | wc -w` ) then
-      \mv $libf/dyn3d${FLAG_PARA}/control.tmp $libf/dyn3d${FLAG_PARA}/control.inc
-endif
-awk 'BEGIN {} { sub ("^c","\!") ; if ($0 ~ /^     S/) {if (NR > 1) print p0," &"; sub ("     S","     \\&")} else { if (NR > 1) print p0  } p0=$0 } END { print p0}' $libf/phylmd/YOMCST.h >! $libf/phylmd/YOMCST.tmp
-if ( ! -f $libf/phylmd/YOMCST.inc  || `diff $libf/phylmd/YOMCST.tmp $libf/phylmd/YOMCST.inc | wc -w` ) then
-      \mv $libf/phylmd/YOMCST.tmp $libf/phylmd/YOMCST.inc
-endif
-awk 'BEGIN {} { sub ("^c","\!") ; if ($0 ~ /^     S/) {if (NR > 1) print p0," &"; sub ("     S","     \\&")} else { if (NR > 1) print p0  } p0=$0 } END { print p0}' $libf/phylmd/clesphys.h >! $libf/phylmd/clesphys.tmp
-if ( ! -f $libf/phylmd/clesphys.inc  || `diff $libf/phylmd/clesphys.tmp $libf/phylmd/clesphys.inc | wc -w` ) then
-      \mv $libf/phylmd/clesphys.tmp $libf/phylmd/clesphys.inc
-endif
 ##########################################
 cd $model
@@ -851 +831 @@
    set f90=$FC_LINUX
    if ( $FC_LINUX == 'pgf90' ) then
-   set opt_link=" -L$MODIPSLDIR $link_veget -L$NCDFLIB -lioipsl -lnetcdf -Wl,-Bstatic -L/usr/lib/gcc-lib/i386-linux/2.95.2/"
+   set opt_link=" -L$MODIPSLDIR $link_veget -L$NCDFLIB -lioipsl -lnetcdf "
    else if ($FC_LINUX == 'g95') then
      set opt_link="-L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lioipsl -lnetcdf "