Changeset 487 for LMDZ.3.3/branches
- Timestamp:
- Jan 12, 2004, 11:47:12 AM (21 years ago)
- Location:
- LMDZ.3.3/branches/rel-LF
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ.3.3/branches/rel-LF/create_make_gcm
r328 r487 14 14 XNEC=1 15 15 fi 16 X6NEC=0 17 if [ "$machine" = "mercure" ] ; then 18 X6NEC=1 19 fi 16 20 VPP=0 17 21 if [ "$machine" = "nymphea0" ] ; then … … 51 55 echo '# Les differentes librairies pour l"edition des liens:' 52 56 echo 53 if [ "$XNEC" = '1' ]; then57 if ( [ "$XNEC" = '1' ] || [ "$X6NEC" = '1' ] ) ; then 54 58 echo 'dyn3d = $(LIBO)/libsxdyn3d.a $(LIBO)/libsx$(FILTRE).a' 55 59 echo 'dyn2d = $(LIBO)/libsxdyn2d.a' … … 170 174 F90=0 ; egrep -i '^ *use ' $trufile > /dev/null 2>&1 && F90=1 171 175 egrep -i '^ *module ' $trufile > /dev/null 2>&1 && F90=1 176 egrep -i '#include*.inc ' $trufile > /dev/null 2>&1 && F90=1 172 177 str1='$(LIBO)/lib'$diri'.a('$fili'.o) : $(LIBF)/'$diri/$trufile 173 178 [ "$fili" = "chem.subs" ] && str1=$str1' $(LIBF)/'$diri/chem.mods.F … … 213 218 fi 214 219 fi 215 if [ "$XNEC" -eq '1' ]; then220 if ( [ "$XNEC" -eq '1' ] || [ "$X6NEC" = '1' ] ) ; then 216 221 echo ' sxar r $(LIBO)/libsx'$diri'.a '$fili'.o ; \' 217 222 fi -
LMDZ.3.3/branches/rel-LF/makegcm
r420 r487 23 23 24 24 ###### VERSION LMDZ.3.3 25 set LMDGCM="`pwd`"25 ##set LMDGCM="`pwd`" 26 26 # 27 27 28 28 setenv localdir "`pwd`" 29 setenv LIBOGCM "`pwd`/lib"30 29 set MODIPSL=0 31 30 echo $localdir | grep modipsl >& /dev/null … … 47 46 set NCDFINC=`grep fjvpp ../../util/AA_make.gdef| grep NCDF_INC|sed -e "s/^.* =//"` 48 47 set NCDFLIB=`grep fjvpp ../../util/AA_make.gdef| grep NCDF_LIB|sed -e 's/^.* =//'` 48 else if ( `hostname` == mercure ) then 49 set NCDFINC=`grep sx6nec ../../util/AA_make.gdef| grep NCDF_INC|sed -e "s/^.* =//"` 50 set NCDFLIB=`grep sx6nec ../../util/AA_make.gdef| grep NCDF_LIB|sed -e 's/^.* =//'` 49 51 else 50 52 echo 'Probleme de definition des variables NCDFINC et NCDFLIB' … … 94 96 set NEC=0 95 97 set XNEC=0 98 set X6NEC=0 96 99 if ( `uname` == HP-UX ) then 97 100 set machine=HP … … 109 112 set machine=ALPHA 110 113 set DEC=1 111 else if ( `uname` == Linux ) then114 else if ( `uname` == Linux && `hostname` != mercure ) then 112 115 set machine=LINUX 113 116 set LINUX=1 … … 121 124 set machine=XNEC 122 125 set XNEC=1 126 else if ( `hostname` == mercure) then 127 set machine=X6NEC 128 set X6NEC=1 123 129 else 124 130 echo Vous travaillez sur une machine non prevue par le reglement … … 213 219 set optimbis=" " 214 220 set mod_suffix="mod" 221 else if $X6NEC then 222 set optdbl='-dw -Wf\"-A dbl4\"' 223 set optim90=' -clear -float0 -size_t64 -Ep -DNC_DOUBLE -dw -Wf\"-A dbl4\" -R5 -Wf,"-pvctl loopcnt=40000 fullmsg noassume "' 224 set optimtru90=' -clear -f4 -float0 -size_t64 -Ep -DNC_DOUBLE -dw -Wf\"-A dbl4\" -R2 -R3 -R4 -R5 -Wf,"-pvctl loopcnt=40000 fullmsg noassume"' 225 set optim="$optim90" 226 set optimbis=" " 227 set mod_suffix="mod" 215 228 else 216 229 set optim="" … … 464 477 set nomlib=F90_${dim_}_t${ntrac} 465 478 endif 466 if ( $NEC || $XNEC ) then479 if ( $NEC || $XNEC || $X6NEC) then 467 480 set nomlib=F90_${dim_}_t${ntrac} 468 481 endif … … 684 697 endif 685 698 set mod_loc_dir="./" 699 else if $X6NEC then 700 set f77=sxmpif90 701 set f90=sxmpif90 702 if $MODIPSL then 703 set opt_link="-L$MODIPSLDIR" 704 if ($veget == true) then 705 set opt_link="$opt_link -lsxsechiba -lsxparameters -lsxstomate" 706 endif 707 if ($couple == true) then 708 set opt_link="$opt_link -lsxioipsl -loasis2.4_mpi2 -float0 -size_t64 $optdbl -P static $NCDFLIB " 709 else 710 set opt_link="$opt_link -lsxioipsl -float0 -size_t64 $optdbl -P static $NCDFLIB " 711 endif 712 else 713 set opt_link=" -float0 -size_t64 $optdbl -P static -L$MODIPSLDIR -lsxsechiba -lsxparameters -lsxstomate -lsxioipsl $NCDFLIB " 714 endif 715 set mod_loc_dir="./" 686 716 else 687 717 set f77=f77 … … 700 730 set make="make -k RANLIB=ranlib" 701 731 else if $XNEC then 732 set make="gmake RANLIB=ls" 733 else if $X6NEC then 702 734 set make="gmake RANLIB=ls" 703 735 else … … 758 790 set optim90=" $optim90 -I$libo " 759 791 set optimtru90=" $optimtru90 -I$libo " 792 else if $X6NEC then 793 set optim90=" $optim90 -I$libo " 794 set optimtru90=" $optimtru90 -I$libo " 760 795 else if $LINUX then 761 796 set optim90=" $optim90 -module $libo " … … 774 809 set link="$f90 " 775 810 # set ar=sxar 811 else if $X6NEC then 812 set link="sxld $opt_link" 813 set link="$f90 " 776 814 endif 777 815
Note: See TracChangeset
for help on using the changeset viewer.