Changeset 1785 for LMDZ5/trunk/makegcm

Timestamp:

Jul 16, 2013, 11:22:04 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Transformation de l'include indicesol.h en un module indice_sol_mod et modification des appels dans tous les fichiers concernés.
Aucun changement des résultats ni des sorties du modèle vs 1784.
UG

...................................................

Replacement of the indicesol.h include by a module named indice_sol_mod. Modification of the calls in every affected files.
Results and outputs of simulations are unchanged in comparison with rev 1784.
UG

File:

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

LMDZ5/trunk/makegcm

@@ -23 +23 @@
 set OPTIMI='-C debug -eC '
 set OPTIMI=' -ftrace '
-set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
-set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
+set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
 set io=ioipsl
 set cosp=false
 
-set FC_LINUX=g95
-set FC_LINUX=g95
-#set FC_LINUX=g95
-if ( $FC_LINUX == g95 ) then
-  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+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"
 else if ( $FC_LINUX == gfortran ) then
-  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
-#   set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
-  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+  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="-i4 -O3 -r8 -DNC_DOUBLE"
+  set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
 endif
 
@@ -54 +54 @@
 setenv IOIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
 setenv MODIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
-setenv NCDFINC /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/include
-setenv NCDFLIB /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/lib
+setenv NCDFINC /home/users/uglmd/lmdz/MAMBO/LMDZXIOS/LMDZtrunk/netcdf-4.0.1/include
+setenv NCDFLIB /home/users/uglmd/lmdz/MAMBO/LMDZXIOS/LMDZtrunk/netcdf-4.0.1/lib
 
 
@@ -107 +107 @@
   if ( ! $?NCDFLIB ) then
     echo You must initialize the variable NCDFLIB in your environnement
-    echo for instance: "setenv NCDFLIB /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/lib
+    echo for instance: "setenv NCDFLIB /home/users/uglmd/lmdz/MAMBO/LMDZXIOS/LMDZtrunk/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 /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/include
+    echo for instance: "setenv NCDFINC /home/users/uglmd/lmdz/MAMBO/LMDZXIOS/LMDZtrunk/netcdf-4.0.1/include
     exit
   endif
@@ -262 +262 @@
 else if $LINUX then
 #################
-   if ( $FC_LINUX == pgf90 || $FC_LINUX == g95 || $FC_LINUX == gfortran ) then
+   if ( $FC_LINUX == pgf90 || $FC_LINUX == gfortran || $FC_LINUX == gfortran ) then
      set optim=" $OPT_LINUX "
      set optim90=" $OPT_LINUX "
@@ -519 +519 @@
              set optim90="$optim90"" -g -ffpe-trap=invalid,zero,overflow -fbounds-check -Wall "
              set optimtru90="$optimtru90"" -ffpe-trap=invalid,zero,overflow -g -fbounds-check -Wall "
-           else if ( $FC_LINUX == 'g95' ) then
+           else if ( $FC_LINUX == 'gfortran' ) then
              set optim="$optim"" -g -fbounds-check -freal=nan -ftrace=full -Wall "
              set optim90="$optim90"" -g -fbounds-check -freal=nan -ftrace=full -Wall "
@@ -841 +841 @@
        set opt_link="$opt_link  -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
      endif
-   else if ($FC_LINUX == 'g95' || $FC_LINUX == 'gfortran' ) then
+   else if ($FC_LINUX == 'gfortran' || $FC_LINUX == 'gfortran' ) then
      if ( $io == "ioipsl" ) then
-       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf -lioipsl -lnetcdff -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB  -lnetcdf -lioipsl  -lnetcdf "
      else
-       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB  -lnetcdf "
      endif
    endif
@@ -1015 +1015 @@
    set optimtru90=" $optimtru90 -module $libo "
    set optim90=" $optim90 -module $libo "
- 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 -I$libo  "
+   set optim90=" $optim90 -I$libo  "
  else if ( $FC_LINUX == 'gfortran' ) then
    set optimtru90=" $optimtru90 -M $libo  "