Changeset 680 for LMDZ4/trunk/makegcm

Timestamp:

Feb 21, 2006, 10:09:52 AM (19 years ago)

Author:

lmdzadmin

Message:

Rajout pour INCA - AC MAF

File:

• LMDZ4/trunk/makegcm (modified) (4 diffs)

LMDZ4/trunk/makegcm

@@ -33 +33 @@
 
 ###### VERSION LMDZ.4
-# set LMDGCM=$HOME/LMDZ.4
+#set LMDGCM=/workdir/p86cozic/INCA_dev/LMDZ4
 #setenv LIBOGCM $LMDGCM/libo
 #set LMDGCM="`pwd`"
@@ -267 +267 @@
 #################
    set optdbl='-dw -Wf\"-A dbl4\"'  
-   set optim90=' -clear -float0 -f3 -size_t64 -P stack -Wf "-init stack=nan -init heap=nan" -EP -DNC_DOUBLE -dw -Wf\"-A dbl4\" -R5 -Wf,"-pvctl loopcnt=40000 fullmsg noassume "'
-   set optimtru90=' -clear -f4 -float0 -size_t64 -P stack -Wf "-init stack=nan -init heap=nan" -EP -DNC_DOUBLE -dw -Wf\"-A dbl4\" -R2 -R3 -R4 -R5 -Wf,"-pvctl loopcnt=40000 fullmsg noassume"'
+   set optim90=' -clear -float0 -f3 -size_t64 -P stack -Wf "-init stack=nan -init heap=nan" -Ep -DNC_DOUBLE -dw -Wf\"-A dbl4\" -R5 -Wf,"-pvctl loopcnt=40000 fullmsg noassume "'
+   set optimtru90=' -clear -f4 -float0 -size_t64 -P stack -Wf "-init stack=nan -init heap=nan" -Ep -DNC_DOUBLE -dw -Wf\"-A dbl4\" -R2 -R3 -R4 -R5 -Wf,"-pvctl loopcnt=40000 fullmsg noassume"'
    set optim="$optim90"
    set optimbis=" "
@@ -366 +366 @@
            pour selectionner la vegetation (par defaut) ou non
 
--chimie CH4|CH4_AER|NMHC|NMHC_AER|false
+-chimie CH4|CH4_AER|NMHC|NMHC_AER|AER|GES|false
            pour selectionner ou non la chimie (par defaut sans)
 
@@ -540 +540 @@
     set optim="$optim -DINCA -DINCA_NMHC -DINCA_AER"
     set optim90="$optim"
-endif
-if ( "$chimie" == 'CH4' || "$chimie" == 'CH4_AER' || "$chimie" == 'NMHC' || "$chimie" == 'NMHC_AER' ) then
+else if ( "$chimie" == 'AER' ) then
+    set optim="$optim -DINCA -DINCA_AER"
+    set optim90="$optim"
+else if ("$chimie" == 'GES' ) then
+    set optim="$optim -DINCA" 
+    set optim90="$optim"
+endif
+if ( "$chimie" == 'CH4' || "$chimie" == 'CH4_AER' || "$chimie" == 'NMHC' || "$chimie" == 'NMHC_AER' || "$chimie" == 'AER' || "$chimie" == 'GES' ) then
     set opt_dep="$opt_dep chimie" 
     set libchimie="-lchimie"