Changeset 1563 for LMDZ5/trunk/libf/dyn3d
- Timestamp:
- Aug 29, 2011, 3:32:52 PM (13 years ago)
- Location:
- LMDZ5/trunk/libf/dyn3d
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/dyn3d/ce0l.F90
r1511 r1563 67 67 #endif 68 68 69 IF ( config_inca /= 'none') THEN69 IF (type_trac == 'inca') THEN 70 70 #ifdef INCA 71 71 CALL init_const_lmdz(nbtr,anneeref,dayref,iphysiq,day_step,nday) -
LMDZ5/trunk/libf/dyn3d/conf_gcm.F
r1502 r1563 13 13 use ioipsl_getincom 14 14 #endif 15 USE infotrac, ONLY : type_trac 15 16 IMPLICIT NONE 16 17 c----------------------------------------------------------------------- … … 571 572 offline = .FALSE. 572 573 CALL getin('offline',offline) 574 575 !Config Key = type_trac 576 !Config Desc = Choix de couplage avec model de chimie INCA ou REPROBUS 577 !Config Def = lmdz 578 !Config Help = 579 !Config 'lmdz' = pas de couplage, pur LMDZ 580 !Config 'inca' = model de chime INCA 581 !Config 'repr' = model de chime REPROBUS 582 type_trac = 'lmdz' 583 CALL getin('type_trac',type_trac) 573 584 574 585 !Config Key = config_inca … … 643 654 write(lunout,*)' tauyy = ', tauyy 644 655 write(lunout,*)' offline = ', offline 656 write(lunout,*)' type_trac = ', type_trac 645 657 write(lunout,*)' config_inca = ', config_inca 646 658 write(lunout,*)' ok_dynzon = ', ok_dynzon … … 761 773 offline = .FALSE. 762 774 CALL getin('offline',offline) 775 776 !Config Key = type_trac 777 !Config Desc = Choix de couplage avec model de chimie INCA ou REPROBUS 778 !Config Def = lmdz 779 !Config Help = 780 !Config 'lmdz' = pas de couplage, pur LMDZ 781 !Config 'inca' = model de chime INCA 782 !Config 'repr' = model de chime REPROBUS 783 type_trac = 'lmdz' 784 CALL getin('type_trac',type_trac) 763 785 764 786 !Config Key = config_inca … … 886 908 write(lunout,*)' tauy = ', tauy 887 909 write(lunout,*)' offline = ', offline 910 write(lunout,*)' type_trac = ', type_trac 888 911 write(lunout,*)' config_inca = ', config_inca 889 912 write(lunout,*)' ok_dynzon = ', ok_dynzon -
LMDZ5/trunk/libf/dyn3d/dynredem.F
r1403 r1563 641 641 #endif 642 642 643 IF ( config_inca /= 'none') THEN643 IF (type_trac == 'inca') THEN 644 644 ! Ajout Anne pour lecture valeurs traceurs dans un fichier start_trac.nc 645 645 ierr_file = NF_OPEN ("start_trac.nc", NF_NOWRITE,nid_trac) … … 654 654 do iq=1,nqtot 655 655 656 IF ( config_inca == 'none') THEN656 IF (type_trac /= 'inca') THEN 657 657 ierr = NF_INQ_VARID(nid, tname(iq), nvarid) 658 658 IF (ierr .NE. NF_NOERR) THEN … … 666 666 ierr = NF_PUT_VAR_REAL (nid,nvarid,q(1,1,iq)) 667 667 #endif 668 ELSE ! config_inca = 'chem' ou 'aero'668 ELSE ! type_trac = inca 669 669 ! lecture de la valeur du traceur dans start_trac.nc 670 670 IF (ierr_file .ne. 2) THEN … … 730 730 #endif 731 731 ENDIF ! (ierr_file .ne. 2) 732 END IF ! config_inca732 END IF !type_trac 733 733 734 734 ENDDO -
LMDZ5/trunk/libf/dyn3d/gcm.F
r1529 r1563 212 212 c----------------------------------------------------------------------- 213 213 214 IF ( config_inca /= 'none') THEN214 IF (type_trac == 'inca') THEN 215 215 #ifdef INCA 216 216 call init_const_lmdz(nbtr,anneeref,dayref,iphysiq,day_step,nday, … … 263 263 endif ! of if (read_start) 264 264 265 IF ( config_inca /= 'none') THEN265 IF (type_trac == 'inca') THEN 266 266 #ifdef INCA 267 267 call init_inca_dim(klon,llm,iim,jjm, -
LMDZ5/trunk/libf/dyn3d/infotrac.F90
r1454 r1563 32 32 SUBROUTINE infotrac_init 33 33 USE control_mod 34 34 35 IMPLICIT NONE 35 36 !======================================================================= … … 85 86 86 87 87 IF (config_inca=='none') THEN 88 type_trac='lmdz' 88 ! Coherence test between parameter type_trac and config_inca 89 IF (type_trac=='inca') THEN 90 WRITE(lunout,*) 'You have choosen to couple with INCA chemestry model : type_trac=', & 91 type_trac,' config_inca=',config_inca 92 IF (config_inca/='aero' .AND. config_inca/='chem') THEN 93 WRITE(lunout,*) 'Incoherence between type_trac and config_inca. Model stops. Modify run.def' 94 CALL abort_gcm('infotrac_init','Incoherence between type_trac and config_inca',1) 95 END IF 96 ELSE IF (type_trac == 'lmdz') THEN 97 WRITE(lunout,*) 'Tracers are treated in LMDZ only : type_trac=', type_trac 89 98 ELSE 90 type_trac='inca' 91 END IF 99 WRITE(lunout,*) 'type_trac=',type_trac,' not possible. Model stops' 100 CALL abort_gcm('infotrac_init','bad parameter',1) 101 END IF 102 103 104 ! Test if config_inca is other then none for run without INCA 105 IF (type_trac/='inca' .AND. config_inca/='none') THEN 106 WRITE(lunout,*) 'config_inca will now be changed to none as you do not couple with INCA model' 107 config_inca='none' 108 END IF 109 92 110 93 111 !----------------------------------------------------------------------- … … 119 137 nbtr=nqtrue 120 138 endif 121 ELSE 122 ! nbtr has been read from INCA by init_con t_lmdz() in gcm.F139 ELSE ! type_trac=inca 140 ! nbtr has been read from INCA by init_const_lmdz() in gcm.F 123 141 nqtrue=nbtr+2 124 142 END IF … … 128 146 CALL abort_gcm('infotrac_init','Not enough tracers',1) 129 147 END IF 148 149 130 150 ! 131 151 ! Allocate variables depending on nqtrue and nbtr
Note: See TracChangeset
for help on using the changeset viewer.