Changeset 5091 for LMDZ6/branches/Amaury_dev/libf/dyn3dmem
- Timestamp:
- Jul 20, 2024, 11:17:09 PM (2 months ago)
- Location:
- LMDZ6/branches/Amaury_dev/libf/dyn3dmem
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynetat0_loc.F90
r5088 r5091 20 20 USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time 21 21 USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 22 USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA 22 23 23 24 IMPLICIT NONE … … 165 166 ix = strIdx(newHNO3, var); IF(ix /= 0) oldVar = oldHNO3(ix) !--- REPROBUS HNO3 exceptions 166 167 #endif 167 #ifdef INCA 168 IF(var == 'O3') oldVar = 'OX' !--- DEAL WITH INCA OZONE EXCEPTION169 #endif 168 IF (CPPKEY_INCA) THEN 169 IF(var == 'O3') oldVar = 'OX' !--- DEAL WITH INCA OZONE EXCEPTION 170 END IF 170 171 !-------------------------------------------------------------------------------------------------------------------------- 171 172 IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lSkip) THEN !=== REGULAR CASE: AVAILABLE VARIABLE -
LMDZ6/branches/Amaury_dev/libf/dyn3dmem/filtreg_p.F
r5082 r5091 361 361 362 362 IF (jdfil<=jffil) THEN 363 IF( ifiltre . EQ.-2 ) THEN363 IF( ifiltre == -2 ) THEN 364 364 CALL Filtre_inv_fft(champ_fft,nlat,jdfil,jffil,nbniv) 365 365 ELSE IF ( griscal ) THEN -
LMDZ6/branches/Amaury_dev/libf/dyn3dmem/leapfrog_loc.F
r5082 r5091 46 46 & xios_set_current_context, 47 47 & using_xios 48 USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA 48 49 49 50 IMPLICIT NONE … … 313 314 c ----- 314 315 315 jD_cur = jD_ref + day_ini - day_ref + &316 jD_cur = jD_ref + day_ini - day_ref + 316 317 & (itau+1)/day_step 317 jH_cur = jH_ref + start_time + &318 jH_cur = jH_ref + start_time + 318 319 & mod(itau+1,day_step)/float(day_step) 319 320 if (jH_cur > 1.0 ) then … … 494 495 if (Adjust) then 495 496 AdjustCount=AdjustCount+1 496 ! if (iapptrac==iapp_tracvl .and. (forward . OR .leapf)497 ! if (iapptrac==iapp_tracvl .and. (forward .OR. leapf) 497 498 ! & .and. itau/iphysiq>2 .and. Adjustcount>30) then 498 499 if (Adjustcount>1) then … … 714 715 & 'leapfrog 686: avant caladvtrac') 715 716 716 IF( forward . OR .leapf ) THEN717 IF( forward .OR. leapf ) THEN 717 718 ! Ehouarn: NB: fields sent to advtrac are those at the beginning of the time step 718 719 !write(*,*) 'leapfrog 679: avant CALL caladvtrac_loc' … … 736 737 ! Ehouarn: Storage of mass flux for off-line tracers... not implemented... 737 738 738 ENDIF ! of IF( forward . OR .leapf )739 ENDIF ! of IF( forward .OR. leapf ) 739 740 740 741 … … 808 809 IF( itau==itaufin.AND..NOT.forward ) lafin = .TRUE. 809 810 ELSE 810 IF( itau+1 . EQ.itaufin ) lafin = .TRUE.811 IF( itau+1 == itaufin ) lafin = .TRUE. 811 812 ENDIF 812 813 … … 1519 1520 endif 1520 1521 1521 #ifdef INCA 1522 IF (CPPKEY_INCA) THEN 1522 1523 IF (ANY(type_trac == ['inca','inco'])) THEN 1523 1524 CALL finalize_inca … … 1529 1530 !$OMP END MASTER 1530 1531 ENDIF 1531 #endif 1532 END IF 1532 1533 #ifdef REPROBUS 1533 1534 if (type_trac == 'repr') CALL finalize_reprobus … … 1548 1549 c ........................................................ 1549 1550 1550 IF(forward .OR. leapf) THEN1551 IF(forward .OR. leapf) THEN 1551 1552 itau= itau + 1 1552 1553 ! iday= day_ini+itau/day_step … … 1559 1560 1560 1561 1561 IF( itau . EQ.itaufinp1 ) then1562 IF( itau == itaufinp1 ) then 1562 1563 1563 1564 if (flag_verif) then … … 1576 1577 c$OMP END MASTER 1577 1578 1578 #ifdef INCA 1579 IF (CPPKEY_INCA) THEN 1579 1580 IF (ANY(type_trac == ['inca','inco'])) THEN 1580 1581 CALL finalize_inca … … 1586 1587 !$OMP END MASTER 1587 1588 ENDIF 1588 #endif 1589 END IF 1589 1590 #ifdef REPROBUS 1590 1591 if (type_trac == 'repr') CALL finalize_reprobus … … 1697 1698 IF( MOD(itau,iperiod)==0 ) THEN 1698 1699 GO TO 1 1699 ELSE IF ( MOD(itau-1,iperiod) . EQ.0 ) THEN1700 ELSE IF ( MOD(itau-1,iperiod) == 0 ) THEN 1700 1701 1701 1702 IF( forward ) THEN … … 1744 1745 1745 1746 forward = .FALSE. 1746 IF( itau . EQ. itaufinp1 ) then1747 IF( itau == itaufinp1 ) then 1747 1748 c$OMP MASTER 1748 1749 call fin_getparam 1749 1750 c$OMP END MASTER 1750 1751 1751 #ifdef INCA 1752 IF (CPPKEY_INCA) THEN 1752 1753 IF (ANY(type_trac == ['inca','inco'])) THEN 1753 1754 CALL finalize_inca … … 1760 1761 ENDIF 1761 1762 1762 #endif 1763 END IF 1763 1764 #ifdef REPROBUS 1764 1765 if (type_trac == 'repr') CALL finalize_reprobus … … 1779 1780 call check_isotopes(q,ijb_u,ije_u,'leapfrog 1698') 1780 1781 1781 IF(MOD(itau,iperiod) .EQ.0 .OR. itau.EQ.itaufin) THEN1782 IF(itau .EQ.itaufin) THEN1782 IF(MOD(itau,iperiod)==0 .OR. itau==itaufin) THEN 1783 IF(itau==itaufin) THEN 1783 1784 iav=1 1784 1785 ELSE … … 1809 1810 1810 1811 1811 IF(MOD(itau,iecri ) .EQ.0) THEN1812 IF(MOD(itau,iecri )==0) THEN 1812 1813 1813 1814 c$OMP BARRIER … … 1837 1838 1838 1839 1839 IF(itau .EQ.itaufin) THEN1840 IF(itau==itaufin) THEN 1840 1841 ! if (planet_type.eq."earth") then 1841 1842 CALL dynredem1_loc("restart.nc",0.0, … … 1863 1864 c$OMP END MASTER 1864 1865 1865 #ifdef INCA 1866 IF (CPPKEY_INCA) THEN 1866 1867 IF (ANY(type_trac == ['inca','inco'])) THEN 1867 1868 CALL finalize_inca … … 1873 1874 !$OMP END MASTER 1874 1875 ENDIF 1875 1876 #endif 1876 END IF 1877 1877 #ifdef REPROBUS 1878 1878 if (type_trac == 'repr') CALL finalize_reprobus -
LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_filtreg_p.F
r5082 r5091 369 369 370 370 IF (jdfil<=jffil) THEN 371 IF( ifiltre . EQ.-2 ) THEN371 IF( ifiltre == -2 ) THEN 372 372 CALL Filtre_inv_fft(champ_fft,jjb,jje,jdfil,jffil,nbniv) 373 373 ELSE IF ( griscal ) THEN
Note: See TracChangeset
for help on using the changeset viewer.