Changeset 3793 for LMDZ6/trunk

Timestamp:

Jan 5, 2021, 10:54:11 AM (4 years ago)

Author:

evignon

Message:

Ajout INLANDSIS phase 2: mise à jour des makefile et creation du
inlandsis.def

Location:

LMDZ6/trunk

Files:

• DefLists/inlandsis.def (added)
• bld.cfg (modified) (1 diff)
• makegcm (modified) (3 diffs)
• makelmdz (modified) (4 diffs)
• makelmdz_fcm (modified) (5 diffs)

LMDZ6/trunk/bld.cfg

@@ -109 +109 @@
 bld::outfile_ext::mod .mod
 bld::tool::SHELL   /bin/bash
+bld::tool::SHELL   /usr/bin/bash

LMDZ6/trunk/makegcm

@@ -42 +42 @@
 set cospv2=false
 set sisvat=false
+set inlandsis=false
 
 set FC_LINUX=gfortran
@@ -518 +519 @@
      case -sisvat
         set sisvat="$2" ; shift ; shift ; goto top
+     case -inlandsis
+        set inlandsis="$2" ; shift ; shift ; goto top
+
 
      case -filtre
@@ -621 +625 @@
 endif
 
+if ( "$inlandsis" == 'true' ) then
+    set cppflags="$cppflags -DCPP_INLANDSIS"
+endif
+
+
 if ( "$physique" == 'nophys' ) then
    set phys="L_PHY= LIBPHY="

LMDZ6/trunk/makelmdz

@@ -28 +28 @@
 cospv2=false
 sisvat=false
+inlandsis=false
 rrtm=false
 rrtm=false
@@ -122 +123 @@
 [-cospv2 true/false]    : compile with/without cospv2 package (default: false)
 [-sisvat true/false]  : compile with/without sisvat package (default: false)
+[-inlandsis true/false]  : compile with/without inlandsis package (default: false)
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
 [-dust true/false]    : compile with/without the dust package from Boucher et al. (default: false)
@@ -192 +194 @@
       "-sisvat")
           sisvat="$2" ; shift ; shift ;;
-      
+
+      "-inlandsis")
+          inlandsis="$2" ; shift ; shift ;;  
+
       "-rrtm")
           rrtm="$2" ; shift ; shift ;;
@@ -518 +523 @@
    src_dirs="$src_dirs phy${physique}/sisvat"
 fi
+
+
+if [[ "$inlandsis" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_INLANDSIS"
+   src_dirs="$src_dirs phy${physique}/inlandsis"
+fi
+
 
 if [[ "$rrtm" == "true" ]]

LMDZ6/trunk/makelmdz_fcm

@@ -24 +24 @@
 veget=false
 sisvat=false
+inlandsis=false
 rrtm=false
 dust=false
@@ -99 +100 @@
 [-cospv2 true/false]    : compile with/without cospv2 package (default: false)
 [-sisvat true/false]  : compile with/without sisvat package (default: false)
+[-inlandsis true/false]  : compile with/without inlandsis package (default: false)
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
 [-dust true/false]    : compile with/without the dust package by Boucher and co (default: false)
@@ -151 +153 @@
       "-sisvat")
           sisvat="$2" ; shift ; shift ;;
+
+      "-inlandsis")
+          inlandsis="$2" ; shift ; shift ;;
 
       "-rrtm")
@@ -415 +420 @@
 fi
 
+if [[ "$inlandsis" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_INLANDSIS"
+   SISVAT_PATH="$LIBFGCM/%PHYS/inlandsis"
+fi
+
+
 if [[ "$rrtm" == "true" ]]
 then
@@ -681 +693 @@
 echo "%STRATAER      $STRATAER_PATH" >> $config_fcm
 echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
+echo "%INLANDSIS     $INLANDSIS_PATH" >> $config_fcm
 echo "%COSP          $COSP_PATH"     >> $config_fcm
 echo "%CPP_KEY       $CPP_KEY"       >> $config_fcm