Changeset 1216 for trunk/LMDZ.GENERIC/makegcm_gfortran

Timestamp:

Apr 3, 2014, 9:09:47 AM (11 years ago)

Author:

emillour

Message:

Generic model:
Major cleanup, in order to ease the use of LMDZ.GENERIC with (parallel) dynamics
in LMDZ.COMMON: (NB: this will break LMDZ.UNIVERSAL, which should be thrashed
in the near future)

• Updated makegcm_* scripts (and makdim) and added the "-full" (to enforce full recomputation of the model) option
• In dyn3d: converted control.h to module control_mod.F90 and converted iniadvtrac.F to module infotrac.F90
• Added module mod_const_mpi.F90 in dyn3d (not used in serial mode)
• Rearanged input/outputs routines everywhere to handle serial/MPI cases. physdem.F => phyredem.F90 , phyetat0.F => phyetat0.F90 ; all read/write routines for startfi files are gathered in module iostart.F90
• added parallelism related routines init_phys_lmdz.F90, comgeomphy.F90, dimphy.F90, iniphysiq.F90, mod_grid_phy_lmdz.F90, mod_phys_lmdz_mpi_data.F90, mod_phys_lmdz_mpi_transfert.F90, mod_phys_lmdz_omp_data.F90, mod_phys_lmdz_omp_transfert.F90, mod_phys_lmdz_para.F90, mod_phys_lmdz_transfert_para.F90 in phymars and mod_const_mpi.F90 in dyn3d (for compliance with parallelism)
• added created generic routines 'planetwide_maxval' and 'planetwide_minval', in module "planetwide_mod", that enable obtaining the max and min of a field over the whole planet. This should be further imroved with computation of means (possibly area weighed), etc.

EM

File:

• trunk/LMDZ.GENERIC/makegcm_gfortran (modified) (9 diffs)

trunk/LMDZ.GENERIC/makegcm_gfortran

@@ -15 +15 @@
 set bands="32x36"
 set scatterers="1"
+set full=""
 ########################################################################
 # path a changer contenant les sources et les objets du modele
@@ -184 +185 @@
    set optim90="-O3 -funroll-loops "
    set optimtru90="-O3 -funroll-loops "
-   set opt_link=" -L$NCDFLIB -lnetcdf -lnetcdff "
+   set opt_link=" -L$NCDFLIB -lnetcdf "
 
    #NB: on gnome -O3 ==> NaNs ...
@@ -274 +275 @@
              latitudes and vertical layers respectively.
 
--t ntrac   Selects the number of tracers present in the model
-
-             Options -d and -t overwrite file 
-             $LMDGCM/libf/grid/dimensions.h
-             which contains the 3 dimensions of the
-             horizontal grid 
-             im, jm, lm plus the number of tracers passively advected
-             by the dynamics ntrac,
-             in 4 PARAMETER FORTRAN format 
-             with a new file:
-             $LMDGCM/libf/grid/dimension/dimensions.im.jm.lm.tntrac
-             If the file does not exist already
-             it is created by the script
-             $LMDGCM/libf/grid/dimension/makdim
-
 -s nscat   Number of radiatively active scatterers
 
@@ -332 +318 @@
            there is no need to specify  -Ldirn.
 
+-full      Full (re)compilation (from scratch)
+
 eod
 exit
@@ -368 +356 @@
      case -olddyn
         set dyntype="olddyn" ; shift; goto top
+
+     case -full
+        set full="full" ; shift ; goto top
 
      case -filtre
@@ -532 +523 @@
 # Build the appropriate 'dimensions.h' file
 cd dimension
-./makdim $ntrac $dim
+./makdim $dim
 # echo contents of dimensions.h to standard output
 cat $libf/grid/dimensions.h
@@ -564 +555 @@
 echo dimension $dimension dim $dim
 if ( $dimension == 1 ) then
-  echo pas de dynamique
-  set dyn="L_DYN= DYN= L_FILTRE= "
+  echo "No dynamics"
+##  set dyn="L_DYN= DYN= L_FILTRE= "
+## NB: we still need to have L_DYN=libdyn3d to reach routines and module
+## objects which are located in dyn3d
+  set dyn="L_DYN=-ldyn3d DYN= L_FILTRE= DIRMAIN=phy$physique "
 endif
 endif
@@ -593 +587 @@
 
 echo "dimc $dimc"
+
+#cleanup for a full recompilation, if requested
+if ("$full" == "full") then
+# remove makefile and $libo
+  cd $model
+  \rm -f makefile
+  \rm -rf $libo/*
+endif
 
 ########################################################################
@@ -657 +659 @@
    set f77="gfortran -ffree-line-length-264"
    set f90="gfortran -ffree-line-length-264"
-   set opt_link=" -L$LIBOGCM -L$NCDFLIB -lnetcdff -lnetcdf "
+#   set opt_link=" -L$LIBOGCM -L$NCDFLIB -lnetcdff -lnetcdf "
+   set opt_link=" -L$LIBOGCM -L$NCDFLIB -lnetcdf "
 else if $SUN then
    set f77=f90