Changeset 957 for trunk/LMDZ.COMMON/makelmdz

Timestamp:

May 10, 2013, 3:00:01 PM (12 years ago)

Author:

emillour

Message:

Common dynamics:

• Add possibility to read a traceur.def with a different format; ie: traceur.def file with lines such as "name hadv vadv" where hadv and vadv are advection scheme number , or even just "name" on each line (advections shceme then defaults to 10, the standard VanLeer? scheme)
• Add the "-s" (number of radiatively active scatterres) and "-b" (number of bands in the IR and visible) options to scripts makelmdz and makelmdz_fcm. Using these options only makes sense if compiling with generic physics.

EM

File:

• trunk/LMDZ.COMMON/makelmdz (modified) (6 diffs)

trunk/LMDZ.COMMON/makelmdz

@@ -24 +24 @@
 fcm_path=none
 cosp=false
+bands=""
+scatterers=""
 dyn=""
 
@@ -35 +37 @@
 fi
 if [[ "${machine:0:6}" == "vargas" ]]
+then
+  arch="PW6_VARGAS"
+fi
+if [[ "${machine:0:6}" == "ada338" ]]
 then
   arch="PW6_VARGAS"
@@ -103 +109 @@
 manuel complet sur http://...
 Usage :
-makegcm [options] exec
-[-h]                       : manuel abrege
-[-d [[IMx]JMx]LM]          : IM, JM, LM sont les dims en x, y, z (def: $dim)
-[-p PHYS]                  : compilation avec la physique libf/phyPHYS, (def: lmd)
-[-prod / -dev / -debug]    : compilation en mode production (default) / developpement / debug .
-[-c false/MPI1/MPI2]       : couple ocean : MPI1/MPI2/false (def: false)
-[-v false/true]            : avec ou sans vegetation (def: false)
-[-chimie INCA/false]       : avec ou sans modele de chimie INCA (def: false)
-[-parallel none/mpi/omp/mpi_omp] : parallelisation (default: none) : mpi, openmp ou mixte mpi_openmp
-[-g GRI]                   : conf. grille dans dyn3d/GRI_xy.h  (def: reg inclue un zoom)
-[-io IO]                   : choix d une librairie I/O, experts (def: ioipsl)
-[-include INCLUDES]        : variables supplementaires pour include
-[-cpp CPP_KEY]             : cle cpp supplementaires
-[-adjnt]                   : adjoint, a remettre en route ...
-[-filtre NOMFILTRE]        : prend le filtre dans libf/NOMFILTRE (def: filtrez)
-[-link LINKS]              : liens optionels avec d autres librairies
-[-ext_src path]            : chemin d un repertoire source avec des sources externe a compiler avec le modele
-[-arch nom_arch]           : nom de l architecture cible
- exec                      : executable genere
+makeldmz [options] -arch arch exec
+[-h]                       : brief help
+[-d [[IMx]JMx]LM]          : IM, JM, LM are the dimensions in x, y, z (default: $dim)
+[-s nscat]                 : (Generic) Number of radiatively active scatterers
+[-b IRxVIS]                : (Generic) Number of infrared (IR) and visible (VIS) bands for radiative transfer
+[-p PHYS]                  : set of physical parametrizations (in libf/phyPHYS), (default: lmd)
+[-prod / -dev / -debug]    : compilation mode production (default) / developement / debug .
+[-c false/MPI1/MPI2]       : (Earth) coupling with ocean model : MPI1/MPI2/false (default: false)
+[-v false/true]            : (Earth) with or without vegetation (default: false)
+[-chimie INCA/false]       : (Earth) with INCA chemistry model or without (default: false)
+[-cosp cosp/false]         : (Earth) add the cosp model (default: false)
+[-parallel none/mpi/omp/mpi_omp] : parallelism (default: none) : mpi, openmp or mixted mpi_openmp
+[-g GRI]                   : grid configuration in dyn3d/GRI_xy.h  (default: reg, inclues a zoom)
+[-io IO]                   : Input/Output library (default: ioipsl)
+[-include INCLUDES]        : extra include path to add
+[-cpp CPP_KEY]             : additional preprocessing definitions
+[-adjnt]                   : adjoint model, not operational ...
+[-filtre NOMFILTRE]        : use filtre from libf/NOMFILTRE (default: filtrez)
+[-link LINKS]              : additional links with other libraries
+[-fcm_path path]           : path to the fcm tool (default: tools/fcm/bin)
+[-ext_src path]            : path to an additional set of routines to compile with the model
+ -arch arch                : target architecture 
+ exec                      : executable to build
 fin
           exit;;
@@ -127 +137 @@
           dim=$2 ; shift ; shift ;;
       
-      "-O")
-          echo "option obsolete dans ce makegcm"
-          exit;;
-
       "-p")
           physique="$2" ;  shift ; shift ;;
+
+      "-s")
+          scatterers=$2 ; shift ; shift ;;
+
+      "-b")
+          bands=$2 ; shift ; shift ;;
 
       "-g")
@@ -168 +180 @@
 
       "-adjnt")
-          echo "option a reactiver ";exit
+          echo "not operational ... work to be done here ";exit
           opt_dep="$opt_dep adjnt" ; adjnt="-ladjnt -ldyn3d "
           optim="$optim -Dadj" ; shift ;;
@@ -416 +428 @@
 cat $LIBFGCM/grid/dimensions.h
 cd $LMDGCM
+
+if [[ "$bands" != "" ]]
+then
+  # Generic model, recreate bands.h (IR & VIS bands for radiative transfer)
+  bands=$(echo $bands | sed -e 's/[^0-9]/ /g')
+  cd $LIBFGCM/phy$physique/bands
+  ./makbands $bands
+  cat $LIBFGCM/phy$physique/bands.h
+  cd $LMDGCM
+fi
+
+if [[ "$scatterers" != "" ]]
+then
+  # Generic model, recreate scatterers.h
+  cd $LIBFGCM/phy$physique/scatterers
+  ./make_scatterers $scatterers
+  cat $LIBFGCM/phy$physique/scatterers.h
+  cd $LMDGCM
+fi