Ignore:
Timestamp:
Oct 24, 2024, 4:25:39 PM (3 months ago)
Author:
abarral
Message:

Move dimensions.h into a module
Nb: doesn't compile yet

Location:
LMDZ6/trunk/libf/phylmd/dyn1d
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmd/dyn1d/1DUTILS.h

    r5270 r5271  
    1 #include "conf_gcm.f90"
     1INCLUDE "conf_gcm.f90"
    22
    33!
    … …  
    1818!   --------------
    1919
    20 #include "compar1d.h"
    21 #include "flux_arp.h"
    22 #include "tsoilnudge.h"
    23 #include "fcg_gcssold.h"
    24 #include "fcg_racmo.h"
     20INCLUDE "compar1d.h"
     21INCLUDE "flux_arp.h"
     22INCLUDE "tsoilnudge.h"
     23INCLUDE "fcg_gcssold.h"
     24INCLUDE "fcg_racmo.h"
    2525!
    2626!
    … …  
    670670      USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn
    671671
    672       IMPLICIT NONE
     672      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     673IMPLICIT NONE
    673674!=======================================================
    674675! Ecriture du fichier de redemarrage sous format NetCDF
    … …  
    676677!   Declarations:
    677678!   -------------
    678       include "dimensions.h"
    679 !!#include "control.h"
     679
     680!!INCLUDE "control.h"
    680681
    681682!   Arguments:
    … …  
    816817      USE temps_mod, ONLY: annee_ref,day_end,day_ref,itau_dyn,itaufin
    817818
    818       IMPLICIT NONE
     819      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     820IMPLICIT NONE
    819821!=======================================================
    820822! Ecriture du fichier de redemarrage sous format NetCDF
    … …  
    822824!   Declarations:
    823825!   -------------
    824       include "dimensions.h"
    825 !!#include "control.h"
     826
     827!!INCLUDE "control.h"
    826828
    827829!   Arguments:
    … …  
    11281130!    Auteur :  P. Le Van .
    11291131!
    1130       IMPLICIT NONE
    1131  
    1132       include "dimensions.h"
     1132      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     1133IMPLICIT NONE
     1134
     1135
    11331136      include "paramet.h"
    11341137!
    … …  
    13481351!---------------------------------------------------------------------- 
    13491352        implicit none
    1350 #include "YOMCST.h"
     1353INCLUDE "YOMCST.h"
    13511354!        argument
    13521355        integer llm
    … …  
    14221425!---------------------------------------------------------------------- 
    14231426        implicit none
    1424 #include "YOMCST.h"
     1427INCLUDE "YOMCST.h"
    14251428!        argument
    14261429        integer llm,nqtot
    … …  
    17411744     &         ,dth_mod_cas,hth_mod_cas,vth_mod_cas,mxcalc)
    17421745 
    1743        implicit none
    1744  
    1745 #include "YOMCST.h"
    1746 #include "dimensions.h"
     1746       USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     1747implicit none
     1748
     1749INCLUDE "YOMCST.h"
     1750
    17471751
    17481752!-------------------------------------------------------------------------

  • LMDZ6/trunk/libf/phylmd/dyn1d/1Dconv.h

    r4593 r5271  
    459459     &                     ,d_t_adv,d_q_adv)
    460460      use dimphy
    461       implicit none
    462 
    463       INCLUDE "dimensions.h"
     461      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     462implicit none
     463
     464
    464465!cccc      INCLUDE "dimphy.h"
    465466

  • LMDZ6/trunk/libf/phylmd/dyn1d/lmdz1d.F90

    r4603 r5271  
    33!
    44!#ifdef CPP_1D
    5 !#include "../dyn3d/mod_const_mpi.F90"
    6 !#include "../dyn3d_common/control_mod.F90"
    7 !#include "../dyn3d_common/infotrac.F90"
    8 !#include "../dyn3d_common/disvert.F90"
     5!INCLUDE "../dyn3d/mod_const_mpi.F90"
     6!INCLUDE "../dyn3d_common/control_mod.F90"
     7!INCLUDE "../dyn3d_common/infotrac.F90"
     8!INCLUDE "../dyn3d_common/disvert.F90"
    99
    1010
    … …  
    2626
    2727
    28 #include "1DUTILS.h"
    29 #include "1Dconv.h"
     28INCLUDE "1DUTILS.h"
     29INCLUDE "1Dconv.h"
    3030
    3131!#endif

  • LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read_std.f90

    r5270 r5271  
    931931       ,dth_mod_cas,hth_mod_cas,vth_mod_cas,mxcalc)
    932932
    933     implicit none
     933    USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     934implicit none
    934935
    935936    INCLUDE "YOMCST.h"
    936     INCLUDE "dimensions.h"
     937
    937938
    938939    !-------------------------------------------------------------------------

  • LMDZ6/trunk/libf/phylmd/dyn1d/old_1DUTILS_read_interp.h

    r5270 r5271  
    542542     &         ,omega_mod,o3mmr_mod,mxcalc)
    543543
    544        implicit none
    545 
    546       INCLUDE "dimensions.h"
     544       USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     545implicit none
     546
     547
    547548
    548549!-------------------------------------------------------------------------
    … …  
    656657     &         ,tke_mod,o3mmr_mod,mxcalc)
    657658
    658        implicit none
    659 
    660       INCLUDE "dimensions.h"
     659       USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     660implicit none
     661
     662
    661663
    662664!-------------------------------------------------------------------------
    … …  
    775777     &             ,ts_rico,t_rico,q_rico,u_rico,v_rico,w_rico             &
    776778     &             ,dth_dyn,dqh_dyn)
    777       implicit none
     779      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     780implicit none
    778781
    779782!-------------------------------------------------------------------------
    780 ! Read RICO forcing data 
     783! Read RICO forcing data
    781784!-------------------------------------------------------------------------
    782       INCLUDE "dimensions.h"
     785
    783786
    784787
    … …  
    10541057     &         ,ht_mod,vt_mod,hq_mod,vq_mod,mxcalc)
    10551058 
    1056        implicit none
    1057  
    1058       INCLUDE "dimensions.h"
     1059       USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     1060implicit none
     1061
     1062
    10591063
    10601064!-------------------------------------------------------------------------
    … …  
    11761180     &         ,dt_mod_cas,ht_mod_cas,vt_mod_cas,dtrad_mod_cas,dq_mod_cas,hq_mod_cas,vq_mod_cas,mxcalc)
    11771181 
    1178        implicit none
    1179  
    1180        INCLUDE "dimensions.h"
     1182       USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     1183implicit none
     1184
     1185
    11811186
    11821187!-------------------------------------------------------------------------
    … …  
    13351340     &         ,ht_mod,hq_mod,hu_mod,hv_mod,w_mod,omega_mod,mxcalc)
    13361341 
    1337        implicit none
    1338  
    1339        INCLUDE "dimensions.h"
     1342       USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     1343implicit none
     1344
     1345
    13401346
    13411347!-------------------------------------------------------------------------

  • LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.f90

    r5268 r5271  
    4848   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_OUTPUTPHYSSCM
    4949
    50       implicit none
    51       INCLUDE "dimensions.h"
     50      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     51implicit none
     52
    5253      INCLUDE "YOMCST.h"
    5354!!      INCLUDE "control.h"

  • LMDZ6/trunk/libf/phylmd/dyn1d/replay1d.f90

    r5268 r5271  
    1010
    1111
    12       implicit none
    13       INCLUDE "dimensions.h"
     12      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     13implicit none
     14
    1415
    1516real :: airefi

  • LMDZ6/trunk/libf/phylmd/dyn1d/scm.f90

    r5268 r5271  
    4444   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_OUTPUTPHYSSCM
    4545
    46       implicit none
    47       INCLUDE "dimensions.h"
     46      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     47implicit none
     48
    4849      INCLUDE "YOMCST.h"
    4950!!      INCLUDE "control.h"
Note: See TracChangeset for help on using the changeset viewer.