Changeset 1246 for trunk/LMDZ.MARS/makegcm_pgf

Timestamp:

May 11, 2014, 2:37:58 PM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS. Made number of scatterers a free dimension not in need to be prescribe at compiling time. Instead it must be set in callphys.def. See README for further information about this commit.

File:

• trunk/LMDZ.MARS/makegcm_pgf (modified) (7 diffs)

trunk/LMDZ.MARS/makegcm_pgf

@@ -13 +13 @@
 set grille=reg
 set dyntype="dyn"
-set scatterers="1"
 set full=""
 ########################################################################
@@ -293 +292 @@
              $LMDGCM/libf/grid/dimension/makdim
 
--s nscat   Number of radiatively active scatterers
-
 -p PHYS    Selects the set of physical parameterizations
            you want to compile the model with.
@@ -353 +350 @@
      case -p
         set physique="$2" ; set phys="PHYS=$physique" ; shift ; shift ; goto top
-
-     case -s
-        set scatterers="$2" ; shift ; goto top
 
      case -g
@@ -472 +466 @@
 # build final name of libraries directory:
 if ( "$dyntype" == "olddyn" ) then
-  set nomlib=${nomlib}_${dim_}_t${ntrac}_s${scatterers}_${grille}_olddyn
+  set nomlib=${nomlib}_${dim_}_t${ntrac}_${grille}_olddyn
 else
-  set nomlib=${nomlib}_${dim_}_t${ntrac}_s${scatterers}_${grille}
+  set nomlib=${nomlib}_${dim_}_t${ntrac}_${grille}
 endif
 
@@ -529 +523 @@
     #remove old dimensions.h file
     \rm -f $libf/grid/dimensions.h
-    #remove old scatterers.h file
-    \rm -f $libf/phy$physique/scatterers.h
   else
     exit
@@ -541 +533 @@
 # echo contents of dimensions.h to standard output
 cat $libf/grid/dimensions.h
-
-cd $libf/phy$physique/scatterers
-# Build the appropriate 'scatterers.h' file
-./make_scatterers $scatterers
-# echo contents of scatterers.h to standard output
-cat $libf/phy$physique/scatterers.h
 
 cd $LMDGCM
@@ -827 +813 @@
 PROG=$code
 
-# cleanup, remove dimensions.h and scatterers.h
+# cleanup, remove dimensions.h 
 \rm -f $libf/grid/dimensions.h
-\rm -f $libf/phy$physique/scatterers.h