Changeset 1910 for LMDZ5/branches/testing/tools/install_1d_src.sh

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (2 props)
• tools (modified) (1 prop)
• tools/install_1d_src.sh (modified) (3 diffs, 1 prop)

LMDZ5/branches/testing/tools/install_1d_src.sh

@@ -13 +13 @@
   if [[ ! -a ../phy1d/$my_file ]]
       then
-      cp $my_file ../phy1d
+#     cp $my_file ../phy1d
+      cp -R $my_file ../phy1d 
   fi
 done
@@ -19 +20 @@
 
 cd ../phy1d
-if grep -iq "subroutine *writelim" *.F *.F90
-    then
-    mv 1DUTILS.h_no_writelim 1DUTILS.h
-else
-    mv 1DUTILS.h_with_writelim 1DUTILS.h
-    rm -f ttt
-    sed -e "s/^ *call *writelim *( *1 *,/      call writelim (/" lmdz1d.F >ttt
-    rm -f lmdz1d.F
-    mv ttt lmdz1d.F
-fi
-rm 1DUTILS.h*writelim
 rm wrgradsfi.F # already in 1DUTILS.h
 
-sed -i -e "/add_phys_tend.*_vdf/s/add_phys_tend/add_pbl_tend/" physiq.F
+sed -i -e "/add_phys_tend.*_vdf/s/add_phys_tend/add_pbl_tend/" physiq.F90
 
 sed -i -e "/SUBROUTINE *convers_timesteps/,/END SUBROUTINE convers_timesteps/{
@@ -49 +39 @@
 }" phys_output_mod.F90
 
-sed -i -e "/^ *INCLUDE *\"temps.h\"/{
- a\\
-!****************************************************************************************\\
-! Declarations specifiques pour le 1D. A reprendre \\
-    INCLUDE \"flux_arp.h\"
- }; /^.*REAL *::.*fsens *, *flat/d; /^.*LOGICAL *::.*ok_flux_surf/d; /^.*COMMON.*flux_arp.*/d " pbl_surface_mod.F90 
-
  ln -s ../dyn3d/mod_const_mpi.F90 .
  ln -s ../dyn3d/infotrac.F90 .