Changeset 2345 for LMDZ5/trunk/libf/phylmd/cosp

Timestamp:

Aug 21, 2015, 11:57:36 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Physics/dynamics separation:

• move test_disvert_m to dynlonlat_phylonlat/phylmd since it is only used by ce0l and relies on dynamics.
• put "config_inca" in tracinca_mod so physics routines can get the info from there rather than from control_mod.
• get rid of references to "control_mod" from within the physics.

EM

Location:

LMDZ5/trunk/libf/phylmd/cosp

Files:

• cosp_output_mod.F90 (modified) (2 diffs)
• cosp_output_write_mod.F90 (modified) (16 diffs)
• phys_cosp.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/cosp/cosp_output_mod.F90

@@ -100 +100 @@
   USE ioipsl
   USE phys_cal_mod
+  USE time_phylmdz_mod, ONLY: day_ref, annee_ref, day_ini, start_time, itau_phy
   USE print_control_mod, ONLY: lunout
 
@@ -123 +124 @@
 
 !!! Variables d'entree
-  include "temps.h"
 
 #ifdef CPP_XIOS

LMDZ5/trunk/libf/phylmd/cosp/cosp_output_write_mod.F90

@@ -21 +21 @@
 
     USE ioipsl
-    USE control_mod
+    USE time_phylmdz_mod, ONLY: itau_phy, start_time, day_step_phy
     USE print_control_mod, ONLY: lunout,prt_level
 
@@ -45 +45 @@
   real, dimension(Npoints,PARASOL_NREFL) :: parasolcrefl, Ncref
 
-  include "temps.h"
-
   Nlevout = vgrid%Nlvgrid
   Ncolout = Ncolumns
 
 ! A refaire
-       itau_wcosp = itau_phy + itap + start_time * day_step / iphysiq
+       itau_wcosp = itau_phy + itap + start_time * day_step_phy
         if (prt_level >= 10) then
-             WRITE(lunout,*)'itau_wcosp, itap, start_time, day_step, iphysiq =', & 
-                             itau_wcosp, itap, start_time, day_step, iphysiq
+             WRITE(lunout,*)'itau_wcosp, itap, start_time, day_step_phy =', & 
+                             itau_wcosp, itap, start_time, day_step_phy
         endif
 
@@ -268 +266 @@
     use iophy
     USE mod_phys_lmdz_para
+    USE mod_grid_phy_lmdz, ONLY: nbp_lon
     USE print_control_mod, ONLY: lunout,prt_level
 #ifdef CPP_XIOS
@@ -275 +274 @@
     IMPLICIT NONE
 
-    INCLUDE "dimensions.h"
-    INCLUDE "temps.h"
     INCLUDE "clesphys.h"
 
@@ -320 +317 @@
        IF ( var%cles(iff) ) THEN
           CALL histdef (cosp_nidfiles(iff), var%name, var%description, var%unit, &
-               iim,jj_nb,nhoricosp(iff), 1,1,1, -99, 32, &
+               nbp_lon,jj_nb,nhoricosp(iff), 1,1,1, -99, 32, &
                typeecrit, zstophym,zoutm_cosp(iff))
        ENDIF
@@ -332 +329 @@
     use iophy
     USE mod_phys_lmdz_para
+    USE mod_grid_phy_lmdz, ONLY: nbp_lon
     USE print_control_mod, ONLY: lunout,prt_level
 
@@ -341 +339 @@
     IMPLICIT NONE
 
-    INCLUDE "dimensions.h"
-    INCLUDE "temps.h"
     INCLUDE "clesphys.h"
 
@@ -415 +411 @@
        IF ( var%cles(iff) ) THEN
           CALL histdef (cosp_nidfiles(iff), nom, var%description, var%unit, &
-               iim, jj_nb, nhoricosp(iff), klevs, 1, &
+               nbp_lon, jj_nb, nhoricosp(iff), klevs, 1, &
                klevs, nvertsave, 32, typeecrit, &
                zstophym, zoutm_cosp(iff))
@@ -428 +424 @@
   USE ioipsl
   use iophy
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
   USE print_control_mod, ONLY: lunout,prt_level
 
@@ -435 +432 @@
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
   INCLUDE 'clesphys.h'
 
@@ -445 +441 @@
     REAL,DIMENSION(klon_mpi) :: buffer_omp
     INTEGER, allocatable, DIMENSION(:) :: index2d
-    REAL :: Field2d(iim,jj_nb)
+    REAL :: Field2d(nbp_lon,jj_nb)
     CHARACTER(LEN=20) ::  nomi, nom
     character(len=2) :: str2
@@ -477 +473 @@
       DO iff=1, 3
            IF (var%cles(iff) .AND. cosp_outfilekeys(iff)) THEN
-                ALLOCATE(index2d(iim*jj_nb))
+                ALLOCATE(index2d(nbp_lon*jj_nb))
 #ifndef CPP_IOIPSL_NO_OUTPUT
-        CALL histwrite(cosp_nidfiles(iff),var%name,itau_iocosp,Field2d,iim*jj_nb,index2d) 
+        CALL histwrite(cosp_nidfiles(iff),var%name,itau_iocosp,Field2d,nbp_lon*jj_nb,index2d) 
 #endif
                 deallocate(index2d)
@@ -517 +513 @@
   USE ioipsl
   use iophy
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
   USE print_control_mod, ONLY: lunout,prt_level
 
@@ -525 +522 @@
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
   INCLUDE 'clesphys.h'
 
@@ -536 +532 @@
 
     REAL,DIMENSION(klon_mpi,SIZE(field,2)) :: buffer_omp
-    REAL :: Field3d(iim,jj_nb,SIZE(field,2))
+    REAL :: Field3d(nbp_lon,jj_nb,SIZE(field,2))
     INTEGER :: ip, n, nlev
     INTEGER, ALLOCATABLE, DIMENSION(:) :: index3d
@@ -580 +576 @@
      DO iff=1, 3
         IF (var%cles(iff) .AND. cosp_outfilekeys(iff)) THEN
-           ALLOCATE(index3d(iim*jj_nb*nlev))
+           ALLOCATE(index3d(nbp_lon*jj_nb*nlev))
 #ifndef CPP_IOIPSL_NO_OUTPUT
-    CALL histwrite(cosp_nidfiles(iff),nom,itau_iocosp,Field3d,iim*jj_nb*nlev,index3d) 
+    CALL histwrite(cosp_nidfiles(iff),nom,itau_iocosp,Field3d,nbp_lon*jj_nb*nlev,index3d) 
 #endif
 

LMDZ5/trunk/libf/phylmd/cosp/phys_cosp.F90

@@ -124 +124 @@
 !$OMP THREADPRIVATE(debut_cosp)
 
-  include "dimensions.h"
-  
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Input variables from LMDZ-GCM
   integer                         :: overlaplmdz   !  overlap type: 1=max, 2=rand, 3=max/rand ! cosp input (output lmdz)