Changeset 1629 for trunk/LMDZ.MARS/makegcm_ifort

Timestamp:

Nov 22, 2016, 12:08:15 PM (8 years ago)

Author:

jaudouard

Message:

Bug fix concerning riceco2 declaration and some cleaning concerning the CO2 clouds scheme

File:

• trunk/LMDZ.MARS/makegcm_ifort (modified) (8 diffs)

trunk/LMDZ.MARS/makegcm_ifort

@@ -6 +6 @@
 ########################################################################
 set dim="64x48x32"
+set dim="32"
 set physique=mars
 set phys="PHYS=$physique"
@@ -40 +41 @@
 if ( $? == 0 ) then
    echo "*** NETCDF preset *** GNOME cluster"
-   setenv NCDFLIB /usr/local/lib
-   setenv NCDFINC /usr/local/include
+   setenv NCDFLIB /usr/lib64
+   setenv NCDFINC /usr/include
 endif
 hostname | grep 'ciclad' > /dev/null
@@ -55 +56 @@
    setenv NCDFINC /smplocal/pub/NetCDF/4.1.3/seq/include
 endif
+#### LATMOS
+hostname | grep 'latmos.ipsl.fr' > /dev/null
+if ( $? == 0 ) then
+   echo "*** NETCDF preset *** LATMOS"
+   setenv NCDFLIB /net/nfs/exoclim/audouard/GCM_MARS/netcdf-4.0.1/lib
+   setenv NCDFINC /net/nfs/exoclim/audouard/GCM_MARS/netcdf-4.0.1/include
+endif
+
+
+    setenv NCDFLIB /opt/netcdf43/ifort/lib
+    setenv NCDFINC /opt/netcdf43/ifort/include
+
+
 ### end NetCDF presets
 
@@ -189 +203 @@
 if $CRAY then
    set optim90="-Wp'-P' -DCRAY "'-p$(LIBO) -eiv '
-   set oplink="-Wl'-DSTACK=128 -f indef' -L$NCDFLIB -lnetcdf "
+   set oplink="-Wl'-DSTACK=128 -f indef' -L$NCDFLIB -lnetcdff "
    set mod_loc_dir=" "
    set mod_suffix=" "
@@ -195 +209 @@
    set optim90=" -fast"
    set optimtru90=" -fast -free"
-   set opt_link="-L$NCDFLIB -lnetcdf"
+   set opt_link="-L$NCDFLIB -lnetcdff"
    set mod_loc_dir=$localdir
    set mod_suffix=mod
@@ -420 +434 @@
         else if $LINUX then
            ## for ifort
-             set optim=" -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check all -debug"
-             set optim90=" -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check all -debug"
-             set optimtru90=" -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check all -debug"
+             set optim=" -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check all -debug -DNC_DOUBLE -real-size 64 "
+             set optim90=" -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check all -debug -DNC_DOUBLE -real-size 64  "
+             set optimtru90=" -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check all -debug -DNC_DOUBLE -real-size 64  "
         else 
            echo "pas d option debug predefinie pour cette machine"
@@ -721 +735 @@
    set f77=ifort
    set f90=ifort
-   set opt_link=" -L$LIBOGCM -L$NCDFLIB -lnetcdf "
+   set opt_link=" -L$LIBOGCM -L$NCDFLIB -lnetcdff "
 else if $SUN then
    set f77=f90
@@ -773 +787 @@
 else if $LINUX then
 # Ehouarn : adapt to gfortran
- set optim="$optim -I${libo} $cpp_def"
- set optim90="$optim90 -I${libo} $cpp_def"
- set optimtru90="$optimtru90 -I${libo} $cpp_def"
+ set optim="$optim -I${libo} $cpp_def  -DNC_DOUBLE -real-size 64"
+ set optim90="$optim90 -I${libo} $cpp_def -DNC_DOUBLE -real-size 64 "
+ set optimtru90="$optimtru90 -I${libo} $cpp_def  -DNC_DOUBLE -real-size 64"
 # Ehouarn: remove set mod_loc_dir def below; mod_loc_dir=$localdir (set above)
 # set mod_loc_dir=$libo