Changeset 4178

Timestamp:

Dec 19, 2019, 1:29:16 PM (5 years ago)

Author:

dubos

Message:

simple_physics : reorganization

Location:

dynamico_lmdz/simple_physics

Files:

• config (added)
• config/LMDZ (added)
• config/LMDZ/TEST_PARAM (added)
• config/LMDZ/TEST_PARAM/config.def (added)
• config/LMDZ/TEST_PARAM/gcm.def (added)
• config/LMDZ/TEST_PARAM/gcm.e (added)
• config/LMDZ/TEST_PARAM/guide.def (added)
• config/LMDZ/TEST_PARAM/orchidee.def (added)
• config/LMDZ/TEST_PARAM/physiq.def (added)
• config/LMDZ/TEST_PARAM/planete.def (added)
• config/LMDZ/TEST_PARAM/run.def (added)
• config/LMDZ/TEST_PARAM/run_local.sh (added)
• config/LMDZ/TEST_PARAM/traceur.def (added)
• config/LMDZ/TEST_PARAM/vert.def (added)
• config/LMDZ/build_lmdz_phyparam.sh (moved) (moved from dynamico_lmdz/simple_physics/install_param.sh) (4 diffs)
• phyparam/dynphy_lonlat (added)
• phyparam/dynphy_lonlat/iniphysiq_mod.F90 (added)
• phyparam/param/physiq_mod.F90 (moved) (moved from dynamico_lmdz/simple_physics/phyparam/physiq_mod.F90)

dynamico_lmdz/simple_physics/config/LMDZ/build_lmdz_phyparam.sh

@@ -1 +1 @@
 #!/bin/bash
-
 
 function cmd_install_lmdz()
 {
-# Installation du modele en mode de parallelisation mixte MIPxOpenMP
+# Installation du modele en mode sequentiel
     echo "cmd_install_lmdz"
-    NETCDF_ROOT=$(nc-config --prefix)
-    echo "NETCDF root : $NETCDF_ROOT"
     wget -N http://www.lmd.jussieu.fr/~lmdz/pub/install_lmdz.sh
     export LANG=C # fixes issue with sed on MaxOSX
@@ -16 +13 @@
     echo "Watch $PWD/install_lmdz_patched.log"
     ./install_lmdz_patched.sh -parallel none -v $version >install_lmdz_patched.log 2>&1
-}
-
-function cmd_get_phyparam()
-{
-    echo "cmd_get_phyparam"
-    wget -N http://www.lmd.jussieu.fr/~hourdin/PARAM/phyparam.20191009.tar
-    tar xvf phyparam.20191009.tar 
 }
 
@@ -35 +25 @@
     cd phyparam
     ln -s ../phydev/* .
-    ln -sf $ROOT/phyparam/* .
     ln -sf $ROOT/phyparam/param/* .
     cd ../dynphy_lonlat/phyparam
     ln -s ../phydev/* .
-    ln -sf $ROOT/dynphy_lonlat/phyparam/* .
+    ln -sf $ROOT/phyparam/dynphy_lonlat/* .
     cd $LMDZ
     echo "./makelmdz_fcm -rrtm false  -v false -arch local -j 8 -p param -d 32x32x39 gcm" > compile.sh
@@ -46 +35 @@
 }
 
-
-function cmd_get_param()
-{
-# Recupération des parametres d'entree
-    echo "cmd_get_param"
-    cd $LMDZ
-    wget -N http://www.lmd.jussieu.fr/~hourdin/PARAM/test_param.tar
-    tar xvf test_param.tar
-}
-
 function cmd_()
 {
-#    cmd_get_phyparam
+    rm -rf LMDZ$version install_lmdz.*
     cmd_install_lmdz
     cmd_patch_lmdz
-    cmd_get_param
-    echo puis lancer gcm.e sur TEST_PARAM
+    echo "Now cd TEST_PARAM and execute ./gcm.e"
 }
 
 # On peut choisir la version de LMDZ a insitaller
 version=20191106.trunk
-ROOT=$(pwd)
-LMDZ=$ROOT/LMDZ$version/modipsl/modeles/LMDZ
+LMDZ=$PWD/LMDZ$version/modipsl/modeles/LMDZ
+ROOT=$(cd -P ../.. ; pwd)
 
 cmd_$1