Ignore:
Timestamp:
Oct 19, 2023, 4:02:57 PM (8 months ago)
Author:
idelkadi
Message:

Merged trunk changes -r4488:4726 LMDZ_ECRad branch

Location:
LMDZ6/branches/LMDZ_ECRad
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/LMDZ_ECRad

  • LMDZ6/branches/LMDZ_ECRad/libf/phylmd/dyn1d/mod_1D_cases_read2.F90

    r4482 r4727  
    8181    implicit none
    8282
    83 #include "netcdf.inc"
     83    INCLUDE "netcdf.inc"
    8484
    8585    INTEGER nid,rid,ierr
    … …  
    192192    implicit none
    193193
    194 #include "netcdf.inc"
     194    INCLUDE "netcdf.inc"
    195195
    196196    INTEGER nid,rid,ierr
    … …  
    240240    allocate(plev_cas(nlev_cas,nt_cas),plevh_cas(nlev_cas+1))       
    241241    allocate(z_cas(nlev_cas,nt_cas),zh_cas(nlev_cas+1))
    242     allocate(ap_cas(nlev_cas+1),bp_cas(nt_cas+1))
     242    allocate(ap_cas(nlev_cas+1),bp_cas(nlev_cas+1))
    243243    allocate(t_cas(nlev_cas,nt_cas),q_cas(nlev_cas,nt_cas),qv_cas(nlev_cas,nt_cas),ql_cas(nlev_cas,nt_cas), &
    244244         qi_cas(nlev_cas,nt_cas),rh_cas(nlev_cas,nt_cas))
    … …  
    320320    implicit none
    321321
    322 #include "netcdf.inc"
    323 #include "date_cas.h"
     322    INCLUDE "netcdf.inc"
     323    INCLUDE "date_cas.h"
    324324
    325325    INTEGER nid,rid,ierr
    … …  
    393393    allocate(plev_cas(nlev_cas,nt_cas),plevh_cas(nlev_cas+1))       
    394394    allocate(z_cas(nlev_cas,nt_cas),zh_cas(nlev_cas+1))
    395     allocate(ap_cas(nlev_cas+1),bp_cas(nt_cas+1))
     395    allocate(ap_cas(nlev_cas+1),bp_cas(nlev_cas+1))
    396396    allocate(t_cas(nlev_cas,nt_cas),q_cas(nlev_cas,nt_cas),qv_cas(nlev_cas,nt_cas),ql_cas(nlev_cas,nt_cas), &
    397397         qi_cas(nlev_cas,nt_cas),rh_cas(nlev_cas,nt_cas))
    … …  
    543543  use netcdf, only: nf90_get_var
    544544  implicit none
    545 #include "netcdf.inc"
     545  INCLUDE "netcdf.inc"
    546546
    547547  integer ntime,nlevel
    … …  
    660660  use netcdf, only: nf90_get_var
    661661  implicit none
    662 #include "netcdf.inc"
     662  INCLUDE "netcdf.inc"
    663663
    664664  integer ntime,nlevel
    … …  
    831831  use netcdf, only: nf90_get_var
    832832  implicit none
    833 #include "netcdf.inc"
     833  INCLUDE "netcdf.inc"
    834834
    835835  integer ntime,nlevel,k,t
    … …  
    10611061  !---------------------------------------------------------------------------------------
    10621062
    1063 #include "compar1d.h"
    1064 #include "date_cas.h"
     1063  INCLUDE "compar1d.h"
     1064  INCLUDE "date_cas.h"
    10651065
    10661066  ! inputs:
    … …  
    11351135  !       endif
    11361136  timeit=(day-day_ju_ini_cas)*86400
    1137   print *,'day=',day
    1138   print *,'day_ju_ini_cas=',day_ju_ini_cas
    1139   print *,'pdt_cas=',pdt_cas
    1140   print *,'timeit=',timeit
    1141   print *,'nt_cas=',nt_cas
     1137  !print *,'day=',day
     1138  !print *,'day_ju_ini_cas=',day_ju_ini_cas
     1139  !print *,'pdt_cas=',pdt_cas
     1140  !print *,'timeit=',timeit
     1141  !print *,'nt_cas=',nt_cas
    11421142
    11431143  ! Determine the closest observation times:
    … …  
    11551155  time_cas1=(it_cas1-1)*pdt_cas
    11561156  time_cas2=(it_cas2-1)*pdt_cas
    1157   print *,'it_cas1,it_cas2,time_cas1,time_cas2=',it_cas1,it_cas2,time_cas1,time_cas2
     1157  !print *,'it_cas1,it_cas2,time_cas1,time_cas2=',it_cas1,it_cas2,time_cas1,time_cas2
    11581158
    11591159  if (it_cas1 .gt. nt_cas) then
    … …  
    12701270  !---------------------------------------------------------------------------------------
    12711271
    1272 #include "compar1d.h"
    1273 #include "date_cas.h"
     1272  INCLUDE "compar1d.h"
     1273  INCLUDE "date_cas.h"
    12741274
    12751275  ! inputs:
    … …  
    13501350  !       endif
    13511351  timeit=(day-day_ju_ini_cas)*86400
    1352   print *,'day=',day
    1353   print *,'day_ju_ini_cas=',day_ju_ini_cas
    1354   print *,'pdt_cas=',pdt_cas
    1355   print *,'timeit=',timeit
    1356   print *,'nt_cas=',nt_cas
     1352  !print *,'day=',day
     1353  !print *,'day_ju_ini_cas=',day_ju_ini_cas
     1354  !print *,'pdt_cas=',pdt_cas
     1355  !print *,'timeit=',timeit
     1356  !print *,'nt_cas=',nt_cas
    13571357
    13581358  ! Determine the closest observation times:
    … …  
    13701370  time_cas1=(it_cas1-1)*pdt_cas
    13711371  time_cas2=(it_cas2-1)*pdt_cas
    1372   print *,'timeit,pdt_cas,nt_cas=',timeit,pdt_cas,nt_cas
    1373   print *,'it_cas1,it_cas2,time_cas1,time_cas2=',it_cas1,it_cas2,time_cas1,time_cas2
     1372  !print *,'timeit,pdt_cas,nt_cas=',timeit,pdt_cas,nt_cas
     1373  !print *,'it_cas1,it_cas2,time_cas1,time_cas2=',it_cas1,it_cas2,time_cas1,time_cas2
    13741374
    13751375  if (it_cas1 .gt. nt_cas) then
    … …  
    14031403     t_prof_cas(k) = t_cas(k,it_cas2)                                 &       
    14041404          -frac*(t_cas(k,it_cas2)-t_cas(k,it_cas1))
    1405      print *,'k,frac,plev_cas1,plev_cas2=',k,frac,plev_cas(k,it_cas1),plev_cas(k,it_cas2)
     1405     !print *,'k,frac,plev_cas1,plev_cas2=',k,frac,plev_cas(k,it_cas1),plev_cas(k,it_cas2)
    14061406     theta_prof_cas(k) = theta_cas(k,it_cas2)                         &                     
    14071407          -frac*(theta_cas(k,it_cas2)-theta_cas(k,it_cas1))
Note: See TracChangeset for help on using the changeset viewer.