Changeset 1246 for trunk/LMDZ.MARS/makegcm_g95

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_g95 (modified) (8 diffs)

trunk/LMDZ.MARS/makegcm_g95

@@ -13 +13 @@
 set grille=reg
 set dyntype="dyn"
-set scatterers="1"
 set full=""
 ########################################################################
@@ -19 +18 @@
 ########################################################################
 
-#### If you want you can set environment variables here (instead of
-####  relying on the C-shell environment variables)
-# default LMDGCM to where makegcm script is located:
-set scriptdir=`dirname $0`
-setenv LMDGCM `readlink -f $scriptdir`
-# You may set LIBOGCM to something else; otherwise we default to:
-setenv LIBOGCM $LMDGCM/libo
-## NetCDF Libraries: what follows is OK for LMD 32 and 64bit Linux Machines
-#if ( `uname -m` == "x86_64" ) then
-## 64 bit machines
-  setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_g95/lib
-  setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_g95/include
-#else
-#  setenv NCDFLIB /donnees/emlmd/netcdf-4.0.1_g95/lib
-#  setenv NCDFINC /donnees/emlmd/netcdf-4.0.1_g95/include
-#endif
-####
+##### If you want you can set environment variables here (instead of
+#####  relying on the C-shell environment variables)
+## default LMDGCM to where makegcm script is located:
+#set scriptdir=`dirname $0`
+#setenv LMDGCM `readlink -f $scriptdir`
+## You may set LIBOGCM to something else; otherwise we default to:
+#setenv LIBOGCM $LMDGCM/libo
+### NetCDF Libraries: what follows is OK for LMD 32 and 64bit Linux Machines
+##if ( `uname -m` == "x86_64" ) then
+### 64 bit machines
+#  setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_g95/lib
+#  setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_g95/include
+##else
+##  setenv NCDFLIB /donnees/emlmd/netcdf-4.0.1_g95/lib
+##  setenv NCDFINC /donnees/emlmd/netcdf-4.0.1_g95/include
+##endif
+#####
 
 setenv localdir "`pwd`"
@@ -290 +289 @@
              $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.
@@ -350 +347 @@
      case -p
         set physique="$2" ; set phys="PHYS=$physique" ; shift ; shift ; goto top
-
-     case -s
-        set scatterers="$2" ; shift ; goto top
 
      case -g
@@ -470 +464 @@
 # 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
 
@@ -527 +521 @@
     #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
@@ -540 +532 @@
 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
 # set path to objects directory
@@ -828 +815 @@
 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