Changeset 330 for trunk/MESOSCALE/LMD_MM_MARS

Timestamp:

Oct 25, 2011, 10:10:00 PM (13 years ago)

Author:

aslmd

Message:

MESOSCALE: changes related to g95 support. but the model does not compile apparently. notes taken in NOTES.txt but sorry g95 with LMD_MM_MARS no longer supported at least on 64bits machines. LMDZ.MARS: minor changes related to warning while trying to compile with g95.

Location:

trunk/MESOSCALE/LMD_MM_MARS

Files:

• SRC/WRFV2/mars_lmd_new/makegcm_g95 (modified) (9 diffs)
• makemeso (modified) (2 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_g95

@@ -152 +152 @@
 #setenv localdir "LOCAL_DIR=`pwd`"
 #setenv localdir "`pwd`"
-cd $model
+d $model
 if $CRAY then
    set optim90="-Wp'-P' -DCRAY "'-p$(LIBO) -eiv '
@@ -180 +180 @@
 else if $LINUX then
 # Ehouarn 'g95' compiler
-# Aymeric : added option for NETCDF libraries
-   set optim90=" -DMESOSCALE -O2 -fno-second-underscore -fstatic -fzero -Wall "
-   set optimtru90=" -DMESOSCALE -O2 -fno-second-underscore -fstatic -fzero -Wall "
+   set optim="-O3 -fstatic -funroll-loops -fno-second-underscore -DMESOSCALE"
+   set optim90=" -O3 -fstatic -funroll-loops -fno-second-underscore -DMESOSCALE"
+   set optimtru90=" -O3 -fstatic -funroll-loops -fno-second-underscore -DMESOSCALE"
+## Aymeric : added option for NETCDF libraries
+#   set optim90=" -DMESOSCALE -O2 -fno-second-underscore -fstatic -fzero -Wall
+#   set optimtru90=" -DMESOSCALE -O2 -fno-second-underscore -fstatic -fzero -Wall
 #   set opt_link=" -Mfree -L/usr/local/pgi/linux86/lib -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf -Wl,-Bstatic "
 # Ehouarn: there is no /usr/local/pgi/linux86/lib, but it doesn't matter
@@ -339 +342 @@
                         
     case -O:
-        set optim90="$2" ; shift ; shift ; goto top
+#        set optim90="$2" ; shift ; shift ; goto top
+        set optim="$2" ; set optim90="$2" ; set optimtru90="$2" ; shift ; shift ; goto top
 
      case -p
@@ -375 +379 @@
            set optim90="$optim90"" -G1 "
         else if $LINUX then
-#           set optim90="-g -Mbounds "
-#           set optim90="-mcmodel=medium"
-#         Aymeric : thought I'd complete the g95 debugging 
-          set optim="$optim"" -g -fbounds-check -DMESOSCALE "
-          set optim90="$optim90"" -g -fbounds-check -DMESOSCALE "
-          set optimtru90="$optimtru90"" -g -fbounds-check -DMESOSCALE "
+##           set optim90="-g -Mbounds "
+##           set optim90="-mcmodel=medium"
+##         Aymeric : thought I'd complete the g95 debugging 
+#          set optim="$optim"" -g -fbounds-check -DMESOSCALE "
+#          set optim90="$optim90"" -g -fbounds-check -DMESOSCALE "
+#          set optimtru90="$optimtru90"" -g -fbounds-check -DMESOSCALE "
+           ## for g95
+           set optim="-g -Wall -ftrace=full -fbounds-check -DMESOSCALE"
+           set optim90="-g -Wall -ftrace=full -fbounds-check -DMESOSCALE"
+           set optimtru90="-g -Wall -ftrace=full -fbounds-check -DMESOSCALE"
         else 
            echo "pas d option debug predefinie pour cette machine"
@@ -523 +531 @@
 # Build the appropriate 'dimensions.h' file
 cd dimension
-makdim $ntrac $dim
+./makdim $ntrac $dim
 # echo contents of dimensions.h to standard output
 cat $libf/grid/dimensions.h
@@ -751 +759 @@
 else if $LINUX then
 # Ehouarn : adapt to g95
+ set optim="$optim -fmod=$libo"
  set optim90="$optim90 -fmod=$libo"
  set optimtru90="$optimtru90 -fmod=$libo"
@@ -772 +781 @@
 echo $make -f $LMDGCM/makefile \
 OPTION_DEP="$opt_dep" OPTION_LINK="$opt_link" \
+OPTIM="$optim" \
 OPTIM90="$optim90" \
 OPTIMTRU90="$optimtru90" \
@@ -796 +806 @@
 $make -f $LMDGCM/makefile \
 OPTION_DEP="$opt_dep" OPTION_LINK="$opt_link" \
+OPTIM="$optim" \
 OPTIM90="$optim90" \
 OPTIMTRU90="$optimtru90" \
@@ -817 +828 @@
 PROG=$code
 
+# cleanup, remove dimensions.h
 \rm $libf/grid/dimensions.h

trunk/MESOSCALE/LMD_MM_MARS/makemeso

@@ -389 +389 @@
                      # PGF90, 64 bits, no nesting
      pgf_64_single)    echo 1 | configure > log_compile 2> log_error 
+                       #### the following line is necessary because readtesassim has a line "use netcdf" in it!
+                       #sed s+"-L../mars_lmd/libo -llmd"+"-L../mars_lmd/libo -llmd $NETCDF/lib/libnetcdf.a"+g configure.wrf > yeah ; mv -f yeah configure.wrf
                        sed -f mars.sed configure.wrf > yeah ; mv -f yeah configure.wrf ;;
                      # PGF90, 64 bits, nesting
@@ -400 +402 @@
      g95_64_single)    cd arch ; sed s/"PC Linux i486 i586 i686, g95 compiler"/"PC Linux i486 i586 i686 x86_64, g95 compiler"/g configure.defaults > yeahyeahyeah ; rm configure.defaults ; mv yeahyeahyeah configure.defaults ; cd ..
                        echo 14 | configure > log_compile 2> log_error
+                         ##### marche pas ....
+                         #sed s+"-fno-second-underscore"+""+g configure.wrf > yeah ; mv -f yeah configure.wrf
+                         #sed -f mars.sed configure.wrf > yeah ; mv -f yeah configure.wrf
+                         #sed s+"-L../mars_lmd/libo -llmd"+"-L../mars_lmd/libo -llmd $NETCDF/lib/libnetcdf.a"+g configure.wrf > yeah ; mv -f yeah configure.wrf ;;
                        sed -f mars.sed configure.wrf > yeah ; mv -f yeah configure.wrf ;;
                        #sed s+"=       g95"+"=       /home/physastro/aspiga/mysoft/g95/g95-install/bin/x86_64-unknown-linux-gnu-g95"+g configure.wrf > yeah ; mv -f yeah configure.wrf;;