Changeset 330

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

Files:

• LMDZ.MARS/libf/phymars/dimradmars.h (modified) (1 diff)
• LMDZ.MARS/libf/phymars/meso_inc/meso_inc_les.F (modified) (1 diff)
• LMDZ.MARS/libf/phymars/physiq.F (modified) (3 diffs)
• LMDZ.MARS/libf/phymars/thermcell_dqupdown.F90 (modified) (1 diff)
• MESOSCALE/LMDZ.MARS.new/makegcm_g95 (added)
• MESOSCALE/LMDZ.MARS.new/makegcm_g95.old (copied) (copied from trunk/MESOSCALE/LMDZ.MARS.new/makegcm_g95)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_g95 (modified) (9 diffs)
• MESOSCALE/LMD_MM_MARS/makemeso (modified) (2 diffs)
• MESOSCALE_DEV/NETCDF/g95_netcdf (modified) (1 diff)
• MESOSCALE_DEV/NETCDF/g95_netcdf_nosecondunderscore (added)
• MESOSCALE_DEV/NETCDF/g95_netcdf_regular (added)
• MESOSCALE_DEV/NOTES.txt (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/dimradmars.h

@@ -49 +49 @@
 
 !  Warning : the "nir" thermal IR bands are not ordered by wavelength:
-!      iir=1 : central 15um CO2 bands \    
+!      iir=1 : central 15um CO2 bands     
 !      iir=2 : CO2 band wings    [long1co2-long2co2] MINUS central band
 !      iir=3 : 9 um band [long1ir - long1co2]

trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_inc_les.F

@@ -1 @@
-         if (callrichsl .eq. .false.) then
+         if (.not.callrichsl) then
        
              DO ig=1,ngrid

trunk/LMDZ.MARS/libf/phymars/physiq.F

@@ -89 +89 @@
 c    pt(ngrid,nlayer)      Temperature (K)
 c    pq(ngrid,nlayer,nq)   Advected fields
-c    pudyn(ngrid,nlayer)    \ 
-c    pvdyn(ngrid,nlayer)     \ Dynamical temporal derivative for the
-c    ptdyn(ngrid,nlayer)     / corresponding variables
-c    pqdyn(ngrid,nlayer,nq) /
+c    pudyn(ngrid,nlayer)    | 
+c    pvdyn(ngrid,nlayer)    | Dynamical temporal derivative for the
+c    ptdyn(ngrid,nlayer)    | corresponding variables
+c    pqdyn(ngrid,nlayer,nq) |
 c    pw(ngrid,?)           vertical velocity
 c
@@ -98 +98 @@
 c   -------
 c
-c    pdu(ngrid,nlayermx)        \
-c    pdv(ngrid,nlayermx)         \  Temporal derivative of the corresponding
-c    pdt(ngrid,nlayermx)         /  variables due to physical processes.
-c    pdq(ngrid,nlayermx,nqmx)   /
-c    pdpsrf(ngrid)             /
+c    pdu(ngrid,nlayermx)       |
+c    pdv(ngrid,nlayermx)       |  Temporal derivative of the corresponding
+c    pdt(ngrid,nlayermx)       |  variables due to physical processes.
+c    pdq(ngrid,nlayermx,nqmx)  |
+c    pdpsrf(ngrid)             |
 c    tracerdyn                 call tracer in dynamical part of GCM ?
 
@@ -1773 +1773 @@
          if (calltherm .and. (z_out .gt. 0.)) then
          call surflayer_interpol(ngrid,nlayer,z0,g,zzlay,zu,zv,wmax_th
-     &              ,tsurf,zh,z_out,Teta_out,u_out,ustar,tstar)
+     &              ,tsurf,zh,z_out,Teta_out,u_out,ustar,tstar,L_mo)
 
          zu2(:)=sqrt(zu(:,1)*zu(:,1)+zv(:,1)*zv(:,1))

trunk/LMDZ.MARS/libf/phymars/thermcell_dqupdown.F90

@@ -212 +212 @@
                  if ((q(ig,k) .gt. 0.) .and. ( q(ig,k) .gt. 1.e-15 )) then
                    !! only print if it is the thermal scheme which makes qa<0
-                   print*,'qa<0 created by thermals!!!',charvar,ig,k,fm0(ig,k),qa(ig,k-1),entr0(ig,k),q(ig,k),fm0(ig,k+1),detr0(ig,k)
+                   print*,'qa<0 created by thermals!!!',charvar,ig,k, &
+     &                     fm0(ig,k),qa(ig,k-1),     &
+     &                     entr0(ig,k),q(ig,k),fm0(ig,k+1),detr0(ig,k)
                    print*,'---------> Cancelling qa'
                  endif

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;;

trunk/MESOSCALE_DEV/NETCDF/g95_netcdf

@@ -5 +5 @@
 ###
 
-wget http://www.lmd.jussieu.fr/~hourdin/PATCH_LMDZ4OR_G95/netcdf-3.6.1.tar.gz
-gunzip netcdf-3.6.1.tar.gz
+#wget http://www.lmd.jussieu.fr/~hourdin/PATCH_LMDZ4OR_G95/netcdf-3.6.1.tar.gz
+#gunzip netcdf-3.6.1.tar.gz
 tar xvf netcdf-3.6.1.tar
 

trunk/MESOSCALE_DEV/NOTES.txt

@@ -1 @@
-faire la carte des z0
+--- sur nouvelles machines problemes run parallele avec nouvelle physique
+
+--- makegcm_g95 ne marche pas avec -no-second-underscore
+    marche sans et semble compiler correctement
+
+--- conflits quelque soit la combinaison (f-no-second-underscore ou pas) lors
+de la compilation du dynamical core WRF avec g95 64 bits
+http://forum.wrfforum.com/viewtopic.php?f=5&t=3467
+
+
+gfortran https://bi.offis.de/wisent/tiki-index.php?page=WRF-gFortran
+
 
 cc-----------------------------------