Changeset 1140 for LMDZ4/branches/LMDZ4-dev/makegcm

Timestamp:

Mar 30, 2009, 4:46:54 PM (16 years ago)

Author:

Ehouarn Millour

Message:

Premiere vaque de modifications pour l'unification des dynamiques (planetes-Terre) et un peu de netoyage ...

• modified 'makegcm' and 'makegcm_fcm' to remove 'CPP_PHYS' key and add 'CPP_EARTH' preprocessing key instead
• updated 'diagedyn.F' (in dyn3d and dyn3dpar) to use 'CPP_EARTH' key
• added 'ioipsl_getincom.F90' and 'ioipsl_stringop.F90' to 'dyn3d' and 'dyn3dpar' for future possibility of running without IOIPSL library
• modified conf_gcm.F ( in d'yn3d' and 'dyn3dpar') to read in flag 'planet_type' (default=='earth') (flag added in 'control.h')
• modified 'gcm.F' (in 'dyn3d' and 'dyn3dpar') so that flags so that 'read_start' and 'iflag_phys' (known from conf_gcm.F) are used
• added flag 'output_grads_dyn' (read by conf_gcm.F, stored in 'control.h') to write grads outputs from 'leapfrog.F' and 'leapfrog_p.F'
• removed 'comdiss.h' from 'dyn3d' and 'dyn3dpar' (it is not used)
• removed variable 'lstardis' from 'comdissip.h' (it is also in

'comdissnew.h'), in dyn3d as well as in dyn3dpar

• adapted 'dyn3d/iniacademic.F' to not use 'inicons0.F' but 'iniconst.F'
• updated 'dyn3d/etat0_netcdf.F' to not use 'inicons0' but 'iniconst' (added prerequisite pa=50000 instruction) and added #ifdef CPP_EARTH keys
• removed 'inicons0.F' and 'disvert0.F' (not used any more)

File:

• LMDZ4/branches/LMDZ4-dev/makegcm (modified) (7 diffs)

LMDZ4/branches/LMDZ4-dev/makegcm

@@ -206 +206 @@
    set optim90="-Wp'-P' -DCRAY -p$IOIPSLDIR "'-p$(LIBO) -eiv '
    set optim="$optim90"
-   set oplink="-Wl'-DSTACK=128 -f indef' -L$IOIPSLDIR -lioipsl  -L$NCDFLIB -lnetcdf "
+   if ( $io == "ioipsl" ) then
+     set oplink="-Wl'-DSTACK=128 -f indef' -L$IOIPSLDIR -lioipsl  -L$NCDFLIB -lnetcdf "
+   else
+     set oplink="-Wl'-DSTACK=128 -f indef' -L$IOIPSLDIR -L$NCDFLIB -lnetcdf "
+   endif
    set mod_loc_dir=" "
    set mod_suffix=" "
@@ -216 +220 @@
    set optim90=" -fast -fixed "
    set optimtru90=" -fast -free "
-   set opt_link="-lf77compat -L$MODIPSLDIR -lsechiba -lparameters -lstomate -lioipsl -L$NCDFLIB -lnetcdf "
+   if ( $io == "ioipsl" ) then
+     set opt_link="-lf77compat -L$MODIPSLDIR -lsechiba -lparameters -lstomate -lioipsl -L$NCDFLIB -lnetcdf "
+   else
+     set opt_link="-lf77compat -L$MODIPSLDIR -lsechiba -lparameters -lstomate -L$NCDFLIB -lnetcdf "
+   endif
    set mod_loc_dir=$localdir
    set mod_suffix=mod
@@ -270 +278 @@
    set optim="$optim90"
    set optimbis=" "
-   set opt_link=" -C hopt -float0 -ew -P static -L$MODIPSLDIR -lioipsl  $NCDFLIB -lnetcdf_i8r8_v "
+   if ( $io == "ioipsl" ) then
+     set opt_link=" -C hopt -float0 -ew -P static -L$MODIPSLDIR -lioipsl  $NCDFLIB -lnetcdf_i8r8_v "
+   else
+     set opt_link=" -C hopt -float0 -ew -P static -L$MODIPSLDIR $NCDFLIB -lnetcdf_i8r8_v "
+   endif
    set mod_loc_dir="."
    set mod_suffix="mod"
@@ -533 +545 @@
    set phys="L_PHY= LIBPHY="
 else
-   set cppflags="$cppflags -DCPP_PHYS"
+   #Default planet type is Earth
+   set cppflags="$cppflags -DCPP_EARTH"
 endif
 
@@ -685 +698 @@
 ######################################################################
 
-if ( -f $libf/phy$physique/raddim.h ) then
- if ( -f $libf/phy$physique/raddim.$dimh.h ) then
-  \rm -f $libf/phy$physique/raddim.h
-  cp -p $libf/phy$physique/raddim.$dimh.h $libf/phy$physique/raddim.h
-  echo $libf/phy$physique/raddim.$dimh.h 
-  cat $libf/phy$physique/raddim.$dimh.h 
-  cat $libf/phy$physique/raddim.h
- else
-  echo On peut diminuer la taille de l executable en creant
-  echo le fichier $libf/phy$physique/raddim.$dimh.h
-  \cp -p $libf/phy$physique/raddim.defaut.h $libf/phy$physique/raddim.h
- endif
-endif
+#if ( -f $libf/phy$physique/raddim.h ) then
+# if ( -f $libf/phy$physique/raddim.$dimh.h ) then
+#  \rm -f $libf/phy$physique/raddim.h
+#  cp -p $libf/phy$physique/raddim.$dimh.h $libf/phy$physique/raddim.h
+#  echo $libf/phy$physique/raddim.$dimh.h 
+#  cat $libf/phy$physique/raddim.$dimh.h 
+#  cat $libf/phy$physique/raddim.h
+# else
+#  echo On peut diminuer la taille de l executable en creant
+#  echo le fichier $libf/phy$physique/raddim.$dimh.h
+#  \cp -p $libf/phy$physique/raddim.defaut.h $libf/phy$physique/raddim.h
+# endif
+#endif
 
 ######################################################################
@@ -793 +806 @@
    set f90=$FC_LINUX
    if ( $FC_LINUX == 'pgf90' ) then
-   set opt_link=" -L$MODIPSLDIR $link_veget -L$NCDFLIB -lioipsl -lnetcdf "
+     if ( $io == "ioipsl" ) then
+       set opt_link=" -L$MODIPSLDIR $link_veget -L$NCDFLIB -lioipsl -lnetcdf "
+     else
+       set opt_link=" -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
+     endif
    else if ($FC_LINUX == 'g95') then
-     set opt_link="-L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lioipsl -lnetcdf "
+     if ( $io == "ioipsl" ) then
+       set opt_link="-L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lioipsl -lnetcdf "
+     else
+       set opt_link="-L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lnetcdf "
+     endif
    else
      set opt_link=" "
@@ -804 +825 @@
    set f77=f90
    set f90=f90
-   set opt_link="-lf77compat -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf "
+   if ( $io == "ioipsl" ) then
+     set opt_link="-lf77compat -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf "
+   else
+     set opt_link="-lf77compat -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
+   endif
 #################
 else if $NEC then