Changeset 371 for trunk/LMDZ.GENERIC


Ignore:
Timestamp:
Nov 10, 2011, 9:30:20 AM (13 years ago)
Author:
emillour
Message:

Generic model: updated makegcm(s) so that default behaviour is to set LMDGCM env variable to be the directory in which the makegcm script is. Removed files tmp77, tmp90, liste_des_sources_f90, liste_des_sources_f77 and makefile from the svn repository since these are (re-)created by makegcm.
EM

Location:
trunk/LMDZ.GENERIC
Files:
5 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.GENERIC/README

    r323 r371  
    534534  in the diagfi.nc file. If there is no diagfi.def file, then all variables
    535535  are put in the diagfi.nc file (as was the case before).
     536
     537=== 10/11/2011 == EM
     538- Updated the makegcm(s) so that default behaviour is to set LMDGCM env variable
     539  to be the directory in which the makegcm script is. Updated the makegcm_*
     540  to use "SOURCE" to identify code and be compatible with latest
     541  'create_make_gcm'.
     542 

  • trunk/LMDZ.GENERIC/makegcm

    r301 r371  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo
    … …  
    1919
    2020#### If you want you can set environment variables here
     21# default LMDGCM is where the makegcm script is:
     22#setenv LMDGCM `pwd`"/"`dirname $0` # only works for relative paths
     23setenv LMDGCM `readlink -f $0`
    2124#setenv LMDGCM "/san/home/rdword/gcm/LMDZ.GENERIC"
    22 #setenv LIBOGCM $LMDGCM/libo
     25setenv LIBOGCM $LMDGCM/libo
     26# NetCDF, what is below is OK on Gnome
    2327setenv NCDFLIB /usr/local/lib
    2428setenv NCDFINC /usr/local/include
     29# NetCDF, on LMD farm:
     30#setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_ifort/lib
     31#setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_ifort/include
    2532####
    2633
    … …  
    171178else if $LINUX then
    172179   #NB: on gnome -O3 ==> NaNs ...
    173    set optim=" -O2 -ip -mkl=sequential -align common "
    174    set optim90=" -O2 -ip -mkl=sequential -align common "
    175    set optimtru90=" -O2 -ip -mkl=sequential -align common "
     180   set optim=" -O2 -ip -mkl=sequential -align all -static "
     181   set optim90=" -O2 -ip -mkl=sequential -align all -static "
     182   set optimtru90=" -O2 -ip -mkl=sequential -align all -static "
    176183   set mod_loc_dir=$LIBOGCM
    177184   set mod_suffix=mod
    … …  
    786793endif
    787794
    788 
    789795echo $make -f $LMDGCM/makefile \
    790796OPTION_DEP="$opt_dep" OPTION_LINK="$opt_link" \

  • trunk/LMDZ.GENERIC/makegcm_g95

    r135 r371  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo
    … …  
    1717########################################################################
    1818
    19 ###### VERSION LMDZ.3.3
    20 # set LMDGCM=$HOME/LMDZ.3.3
    21 #
    22 
    2319#### If you want you can set environment variables here
     20# default LMDGCM is where the makegcm script is:
     21#setenv LMDGCM `pwd`"/"`dirname $0` # only works for relative paths
     22setenv LMDGCM `readlink -f $0`
    2423#setenv LMDGCM /u/emlmd/LMDZ.MARS
    25 #setenv LIBOGCM /tmp15/emlmd/libo
    26 #if ( `uname -m` == "x86_64" ) then
     24setenv LIBOGCM $LMDGCM/libo
     25# NetCDF
    2726# 64 bit machines
    2827#  setenv NCDFLIB /donnees/emlmd/netcdf64_g95/netcdf-3.6.1/lib
    … …  
    759758endif
    760759
    761 
    762760cd $localdir
     761
     762set source_code=${code}.F
     763if (-f $LMDGCM/libf/phystd/${code}.F90) then
     764  set source_code=${code}.F90
     765endif
    763766
    764767echo $make -f $LMDGCM/makefile \
    … …  
    783786MOD_SUFFIX=$mod_suffix \
    784787AR=$ar \
     788SOURCE=$source_code \
    785789PROG=$code
    786790
    … …  
    807811MOD_SUFFIX=$mod_suffix \
    808812AR=$ar \
     813SOURCE=$source_code \
    809814PROG=$code
    810815

  • trunk/LMDZ.GENERIC/makegcm_gfortran

    r253 r371  
    1919
    2020#### If you want you can set environment variables here
     21# default LMDGCM is where the makegcm script is:
     22#setenv LMDGCM `pwd`"/"`dirname $0` # only works for relative paths
     23setenv LMDGCM `readlink -f $0`
    2124#setenv LMDGCM "/san/home/rdword/gcm/LMDZ.GENERIC"
    22 #setenv LIBOGCM $LMDGCM/libo
    23 setenv NCDFLIB /home/rdword/netcdf/lib
    24 setenv NCDFINC /home/rdword/netcdf/include
     25setenv LIBOGCM $LMDGCM/libo
     26# NetCDF, on LMD computers:
     27setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_gfortran/lib
     28setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_gfortran/include
    2529####
    2630
    … …  
    791795endif
    792796
    793 
    794797cd $localdir
    795798
     799set source_code=${code}.F
     800if (-f $LMDGCM/libf/phystd/${code}.F90) then
     801  set source_code=${code}.F90
     802endif
    796803
    797804echo $make -f $LMDGCM/makefile \
    … …  
    817824MOD_SUFFIX=$mod_suffix \
    818825AR=$ar \
     826SOURCE=$source_code \
    819827PROG=$code
    820828
    … …  
    842850MOD_SUFFIX=$mod_suffix \
    843851AR=$ar \
     852SOURCE=$source_code \
    844853PROG=$code
    845854

  • trunk/LMDZ.GENERIC/makegcm_ifort

    r253 r371  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo
    … …  
    1919
    2020#### If you want you can set environment variables here
     21# default LMDGCM is where the makegcm script is:
     22#setenv LMDGCM `pwd`"/"`dirname $0` # only works for relative paths
     23setenv LMDGCM `readlink -f $0`
    2124#setenv LMDGCM "/san/home/rdword/gcm/LMDZ.GENERIC"
    22 #setenv LIBOGCM $LMDGCM/libo
     25setenv LIBOGCM $LMDGCM/libo
     26# NetCDF, what is below is OK on Gnome
    2327setenv NCDFLIB /usr/local/lib
    2428setenv NCDFINC /usr/local/include
     29# NetCDF, on LMD farm:
     30#setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_ifort/lib
     31#setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_ifort/include
    2532####
    2633
    … …  
    171178else if $LINUX then
    172179   #NB: on gnome -O3 ==> NaNs ...
    173    set optim=" -O2 -ip -mkl=sequential -align common "
    174    set optim90=" -O2 -ip -mkl=sequential -align common "
    175    set optimtru90=" -O2 -ip -mkl=sequential -align common "
     180   set optim=" -O2 -ip -mkl=sequential -align all -static "
     181   set optim90=" -O2 -ip -mkl=sequential -align all -static "
     182   set optimtru90=" -O2 -ip -mkl=sequential -align all -static "
    176183   set mod_loc_dir=$LIBOGCM
    177184   set mod_suffix=mod
    … …  
    779786endif
    780787
    781 
    782788cd $localdir
    783789
     790set source_code=${code}.F
     791if (-f $LMDGCM/libf/phystd/${code}.F90) then
     792  set source_code=${code}.F90
     793endif
    784794
    785795echo $make -f $LMDGCM/makefile \
    … …  
    805815MOD_SUFFIX=$mod_suffix \
    806816AR=$ar \
     817SOURCE=$source_code \
    807818PROG=$code
    808 
    809819
    810820$make -f $LMDGCM/makefile \
    … …  
    830840MOD_SUFFIX=$mod_suffix \
    831841AR=$ar \
     842SOURCE=$source_code \
    832843PROG=$code
    833844

  • trunk/LMDZ.GENERIC/makegcm_pgf90

    r253 r371  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo
    … …  
    1919
    2020#### If you want you can set environment variables here
     21# default LMDGCM is where the makegcm script is:
     22#setenv LMDGCM `pwd`"/"`dirname $0` # only works for relative paths
     23setenv LMDGCM `readlink -f $0`
    2124#setenv LMDGCM "/san/home/rdword/gcm/LMDZ.GENERIC"
    22 #setenv LIBOGCM $LMDGCM/libo
    23 #setenv NCDFLIB /usr/local/lib
    24 #setenv NCDFINC /usr/local/include
    25 if ( `uname -m` == "x86_64" ) then
    26 # 64 bit machines
    27   setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_pgi/lib
    28   setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
    29 else
    30   setenv NCDFLIB /donnees/emlmd/netcdf-4.0.1_pgi/lib
    31   setenv NCDFINC /donnees/emlmd/netcdf-4.0.1_pgi/include
    32 endif
     25setenv LIBOGCM $LMDGCM/libo
     26# NetCDF, on LMD 64 bit machines
     27setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_pgi/lib
     28setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
    3329####
    3430
    … …  
    803799cd $localdir
    804800
     801set source_code=${code}.F
     802if (-f $LMDGCM/libf/phystd/${code}.F90) then
     803  set source_code=${code}.F90
     804endif
    805805
    806806echo $make -f $LMDGCM/makefile \
    … …  
    826826MOD_SUFFIX=$mod_suffix \
    827827AR=$ar \
     828SOURCE=$source_code \
    828829PROG=$code
    829830
    … …  
    851852MOD_SUFFIX=$mod_suffix \
    852853AR=$ar \
     854SOURCE=$source_code \
    853855PROG=$code
    854856
Note: See TracChangeset for help on using the changeset viewer.