Changeset 1875

Timestamp:

Sep 20, 2013, 4:31:12 PM (11 years ago)

Author:

Laurent Fairhead

Message:

Même si c'est "interdit", réinclusion de g95 dans makegcm pour le 1D en local

---

Even if frowned upon, g95 is introduced back in the compilation choice for local 1D jobs

File:

• LMDZ5/trunk/makegcm (modified) (7 diffs)

LMDZ5/trunk/makegcm

@@ -24 +24 @@
 set OPTIMI=' -ftrace '
 set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
-set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
 set io=ioipsl
 set cosp=false
@@ -30 +29 @@
 
 set FC_LINUX=gfortran
-set FC_LINUX=gfortran
-#set FC_LINUX=gfortran
-if ( $FC_LINUX == gfortran ) then
-  set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
+
+if ( $FC_LINUX == g95 ) then
+  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
 else if ( $FC_LINUX == gfortran ) then
-  set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
-#   set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
   set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
 else
 # pgf90 options
-  set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
+  set OPT_LINUX="-O3 -i4 -r8 -DNC_DOUBLE"
 endif
 
@@ -55 +51 @@
 setenv IOIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
 setenv MODIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
-setenv NCDFINC /tmpdir/fairhead/Test_HEAD/LMDZ20130808.trunk/netcdf-4.0.1/include
-setenv NCDFLIB /tmpdir/fairhead/Test_HEAD/LMDZ20130808.trunk/netcdf-4.0.1/lib
+setenv NCDFINC /d1/mpllmd/LMDZtesting/netcdf-4.0.1/include
+setenv NCDFLIB /d1/mpllmd/LMDZtesting/netcdf-4.0.1/lib
 
 
@@ -108 +104 @@
   if ( ! $?NCDFLIB ) then
     echo You must initialize the variable NCDFLIB in your environnement
-    echo for instance: "setenv NCDFLIB /tmpdir/fairhead/Test_HEAD/LMDZ20130808.trunk/netcdf-4.0.1/lib
+    echo for instance: "setenv NCDFLIB /d1/mpllmd/LMDZtesting/netcdf-4.0.1/lib
     exit
   endif
   if ( ! $?NCDFINC ) then
     echo You must initialize the variable NCDFINC in your environnement
-    echo for instance: "setenv NCDFINC /tmpdir/fairhead/Test_HEAD/LMDZ20130808.trunk/netcdf-4.0.1/include
+    echo for instance: "setenv NCDFINC /d1/mpllmd/LMDZtesting/netcdf-4.0.1/include
     exit
   endif
@@ -263 +259 @@
 else if $LINUX then
 #################
-   if ( $FC_LINUX == pgf90 || $FC_LINUX == gfortran || $FC_LINUX == gfortran ) then
+   if ( $FC_LINUX == pgf90 || $FC_LINUX == g95 || $FC_LINUX == gfortran ) then
      set optim=" $OPT_LINUX "
      set optim90=" $OPT_LINUX "
@@ -849 +845 @@
        set opt_link="$opt_link  -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
      endif
-   else if ($FC_LINUX == 'gfortran' || $FC_LINUX == 'gfortran' ) then
+   else if ($FC_LINUX == 'g95' || $FC_LINUX == 'gfortran' ) then
      if ( $io == "ioipsl" ) then
        set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB  -lnetcdf -lioipsl  -lnetcdf "
@@ -1023 +1019 @@
    set optimtru90=" $optimtru90 -module $libo "
    set optim90=" $optim90 -module $libo "
- else if ( $FC_LINUX == 'gfortran' ) then
-   set optimtru90=" $optimtru90 -I$libo  "
-   set optim90=" $optim90 -I$libo  "
- else if ( $FC_LINUX == 'gfortran' ) then
+else if ( $FC_LINUX == 'g95' ) then 
+   set optimtru90=" $optimtru90 -fmod=$libo  " 
+   set optim90=" $optim90 -fmod=$libo  "
+else if ( $FC_LINUX == 'gfortran' ) then
    set optimtru90=" $optimtru90 -M $libo  "
    set optim90=" $optim90 -M $libo  "