Changeset 2258 for LMDZ5/branches/testing/libf/dyn3d_common

Timestamp:

Apr 13, 2015, 10:21:09 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes 2216:2237 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d_common/coefpoly.F (deleted)
• libf/dyn3d_common/coefpoly_m.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/coefpoly_m.F90)
• libf/dyn3d_common/defrun.F (deleted)
• libf/dyn3d_common/fxhyp_m.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/fxhyp_m.F90)
• libf/dyn3d_common/fxyhyper.F (deleted)
• libf/dyn3d_common/fyhyp.F (deleted)
• libf/dyn3d_common/fyhyp_m.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/fyhyp_m.F90)
• libf/dyn3d_common/grilles_gcm_netcdf_sub.F90 (modified) (2 diffs)
• libf/dyn3d_common/inigeom.F (modified) (2 diffs)
• libf/dyn3d_common/invert_zoom_x_m.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/invert_zoom_x_m.F90)
• libf/dyn3d_common/principal_cshift_m.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d_common/principal_cshift_m.F90)

LMDZ5/branches/testing/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90

@@ -31 +31 @@
   INTEGER out_latudim,out_latvdim,out_dim(3)
   INTEGER out_levdim
-
-  INTEGER, PARAMETER :: longcles = 20
-  REAL  clesphy0(longcles)
 
   INTEGER start(4),COUNT(4)
@@ -60 +57 @@
   pa= 50000.
 
-  CALL conf_gcm( 99, .TRUE. , clesphy0 )
+  CALL conf_gcm( 99, .TRUE. )
   CALL iniconst
   CALL inigeom

LMDZ5/branches/testing/libf/dyn3d_common/inigeom.F

@@ -16 +16 @@
 c
 c
+      use fxhyp_m, only: fxhyp
+      use fyhyp_m, only: fyhyp
       IMPLICIT NONE
 c
@@ -264 +266 @@
       WRITE(6,*)'*** Inigeom , Y = Latitude  , der.tg. hyperbolique ***'
  
-       CALL fxyhyper( clat, grossismy, dzoomy, tauy    , 
-     ,                clon, grossismx, dzoomx, taux    ,
-     , rlatu,yprimu,rlatv, yprimv,rlatu1, yprimu1,rlatu2,yprimu2  ,
-     , rlonu,xprimu,rlonv,xprimv,rlonm025,xprimm025,rlonp025,xprimp025 )
-
+      CALL fyhyp(rlatu, yprimu, rlatv, rlatu2, yprimu2, rlatu1, yprimu1)
+      CALL fxhyp(xprimm025, rlonv, xprimv, rlonu, xprimu, xprimp025)
   
       ENDIF