Changeset 1910 for LMDZ5/branches/testing/tools

Timestamp:

Nov 29, 2013, 9:40:25 AM (12 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/Max_diff_nc_with_lib (modified) (1 prop)
• tools/Max_diff_nc_with_lib/GNUmakefile (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/GNUmakefile (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/Numerical (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/Numerical/averge.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/Numerical/dtridgl.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/Numerical/get_divisors.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/Numerical/quadrat.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/Numerical/spherical.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/avg_mag.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/compare.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/count_lines.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/csvread.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/depend.mk (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/jumble.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/new_unit.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/opt_merge.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/point.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/prep_file.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/prt_cmp.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Jumble/read_column.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Max_diff_nc (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Max_diff_nc/GNUmakefile (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Max_diff_nc/max_diff_nc.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Max_diff_nc/max_diff_nc.sh (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/GNUmakefile (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/array_copy.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/arth.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/assert.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/assert_eq.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/cumprod.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/cumsum.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/depend.mk (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/diagadd.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/diagmult.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/geop.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/get_diag.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/ifirstloc.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/imaxloc.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/iminloc.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/lower_triangle.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/nr_util.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/nrerror.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/nrtype.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/outerand.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/outerdiff.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/outerdiv.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/outerprod.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/outersum.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/poly.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/poly_term.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/put_diag.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/reallocate.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/scatter_add.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/scatter_max.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/swap.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/unit_matrix.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/upper_triangle.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/vabs.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NR_util/zroots_unity.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/GNUmakefile (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/Read_me (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/depend.mk (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/find_coord.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/handle_err.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/netcdf95.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_close.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_copy_att.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_create.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_def_dim.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_def_var.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_enddef.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_get_att.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_get_var.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_gw_var.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_inq_dimid.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_inq_varid.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_inquire.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_inquire_attribute.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_inquire_dimension.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_inquire_variable.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_open.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_put_att.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_put_var.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/NetCDF95/nf95_redef.f90 (modified) (1 prop)
• tools/Max_diff_nc_with_lib/Read_me (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 .